From 97c8d3377cf4f07dceabe7c19f4698e8e359f368 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 7 Jan 2007 18:14:08 +0000
Subject: [PATCH] Applied patch for preview caching (closes #1484186)

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

diff --git a/CHANGELOG b/CHANGELOG
index 2c04a3bae..399162b69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2007/01/07 (thomasb)
+----------
+- Applied patch for preview caching (closes #1484186)
+- Added Thai localization files
+
 2006/12/29 (thomasb)
 ----------
 - Added error handling for attachment uploads
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index aa5b3733d..b1fa7cfb7 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -23,8 +23,11 @@ require_once('Mail/mimeDecode.php');
 
 $PRINT_MODE = $_action=='print' ? TRUE : FALSE;
 
-// allow this request to be cached
-send_future_expire_header();
+// allow caching, unless remote images are present
+if ((bool)get_input_value('_safe', RCUBE_INPUT_GET))
+  send_nocacheing_headers();
+else
+  send_future_expire_header();
 
 // similar code as in program/steps/mail/get.inc
 if ($_GET['_uid'])