From 59c027ba5fa1042ffd0f62bec97a8127002f2b79 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 11 Jun 2009 09:58:11 -0400
Subject: [PATCH] - Fix message Etag generation for counter issues (#1485623)

---
 CHANGELOG                   |    1 +
 program/steps/mail/show.inc |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 81f69ed..7b98465 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix message Etag generation for counter issues (#1485623)
 - Fix messages searching on MailEnable IMAP (#1485762)
 - Fixed many 'skip_deleted' issues (#1485634)
 - Fixed messages list sorting on servers without SORT capability
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 6ab5ba8..39d2e1a 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -50,7 +50,10 @@
     .intval($MESSAGE->headers->mdn_sent)
     .intval($MESSAGE->is_safe)
     .(!empty($MESSAGE->attachments) ? intval($CONFIG['inline_images']) : '')
-    .intval($PRINT_MODE));
+    .intval($PRINT_MODE)
+    .$_SESSION['sort_col'].$_SESSION['sort_order']
+    .$IMAP->messagecount($mbox_name, 'ALL', true)
+    );
 
   // allow caching, unless remote images are present
   if ((bool)$MESSAGE->is_safe)

--
Gitblit v1.9.1