Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 448)
+++ /trunk/roundcubemail/CHANGELOG	(revision 449)
@@ -1,4 +1,9 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2007/01/07 (thomasb)
+----------
+- Applied patch for preview caching (closes #1484186)
+- Added Thai localization files
 
 2006/12/29 (thomasb)
Index: /trunk/roundcubemail/program/steps/mail/show.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/show.inc	(revision 448)
+++ /trunk/roundcubemail/program/steps/mail/show.inc	(revision 449)
@@ -24,6 +24,9 @@
 $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