Enable reply/reply-all/forward buttons also in preview frame of message/rfc822

program/steps/mail/show.inc

@@ -67,7 +67,7 @@ if ($uid) {
     // set message environment
     $OUTPUT->set_env('uid', $msg_id);
     $OUTPUT->set_env('safemode', $MESSAGE->is_safe);
-    $OUTPUT->set_env('no_preview_controls', $MESSAGE->context !== null);
+    $OUTPUT->set_env('message_context', $MESSAGE->context);
     $OUTPUT->set_env('sender', $MESSAGE->sender['string']);
     $OUTPUT->set_env('mailbox', $mbox_name);
     $OUTPUT->set_env('username', $RCMAIL->get_user_name());
@@ -126,6 +126,7 @@ if ($uid) {
 
     // check for unset disposition notification
     if ($MESSAGE->headers->mdn_to
+        && $MESSAGE->context === null
         && empty($MESSAGE->headers->flags['MDNSENT'])
         && empty($MESSAGE->headers->flags['SEEN'])
         && ($RCMAIL->storage->check_permflag('MDNSENT') || $RCMAIL->storage->check_permflag('*'))

skins/classic/templates/messagepreview.html

@@ -16,7 +16,7 @@
     <roundcube:if condition="env:optional_format=='html'" />
       <roundcube:button command="change-format" prop="html" image="/images/icons/html.png" width="15" height="15" title="changeformathtml" id="changeformathtml" />
     <roundcube:endif />
-    <roundcube:if condition="env:no_preview_controls == false">
+    <roundcube:if condition="!env:message_context">
       <roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" />
     <roundcube:endif />
   </div>

skins/larry/templates/messagepreview.html

@@ -15,20 +15,20 @@
 	<span class="buttongroup">
 		<roundcube:button command="change-format" prop="html" type="link" class="button first changeformat html selected" innerClass="icon" title="changeformathtml" content="HTML" /><roundcube:button command="change-format" prop="text" type="link" class="button last changeformat text" classSel="button changeformat text pressed" innerClass="icon" title="changeformattext" content="Text" />
 	</span>
-	&nbsp;
 <roundcube:elseif condition="env:optional_format=='html'" />
+	&nbsp;
 	<span class="buttongroup">
 		<roundcube:button command="change-format" prop="html" type="link" class="button first changeformat html" classSel="button changeformat html pressed" innerClass="icon" title="changeformathtml" content="HTML" /><roundcube:button command="change-format" prop="text" type="link" class="button last changeformat text selected" innerClass="icon" title="changeformattext" content="Text" />
 	</span>
-	&nbsp;
 <roundcube:endif />
-<roundcube:if condition="env:mailbox != config:drafts_mbox and env:no_preview_controls == false">
+<roundcube:if condition="env:mailbox != config:drafts_mbox || env:message_context">
+	&nbsp;
 	<roundcube:button command="reply" type="link" class="button reply" classSel="button reply pressed" innerClass="icon" title="replytomessage" label="replytomessage" />
 	<roundcube:button command="reply-all" type="link" class="button replyall" classSel="button replyall pressed" innerClass="icon" title="replytoallmessage" label="replytoallmessage" />
 	<roundcube:button command="forward" type="link" class="button forward" classSel="button forward pressed" innerClass="icon" title="forwardmessage" label="forwardmessage" />
-	&nbsp;
 <roundcube:endif />
-<roundcube:if condition="env:no_preview_controls == false">
+<roundcube:if condition="!env:message_context">
+	&nbsp;
 	<roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="icon" title="openinextwin" label="openinextwin" />
 <roundcube:endif />
 </div>