--- program/steps/mail/show.inc.old	2007-01-09 20:14:50.000000000 +0000
+++ program/steps/mail/show.inc	2007-01-09 20:28:14.000000000 +0000
@@ -23,8 +23,8 @@
 
 $PRINT_MODE = $_action=='print' ? TRUE : FALSE;
 
-// allow caching, unless remote images are present or we are fetching a message
-if ((bool)get_input_value('_safe', RCUBE_INPUT_GET))
+// allow caching, unless remote images are present
+if (((bool)get_input_value('_safe', RCUBE_INPUT_GET) || (bool)get_input_value('_uid', RCUBE_INPUT_GET)))
   send_nocacheing_headers();
 else
   send_future_expire_header();