diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index be0f434bb..8f50034ba 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -165,6 +165,7 @@ $labels['more']             = 'More';
 $labels['back']             = 'Back';
 $labels['options']          = 'Options';
 $labels['composeoptions']   = 'Compose options';
+$labels['optionsandattachments'] = 'Options and attachments';
 $labels['actions']          = 'Actions';
 
 $labels['first'] = 'First';
@@ -684,6 +685,7 @@ $labels['arialabelcomposeoptions'] = 'Composition options';
 $labels['arialabelresponsesmenu'] = 'Canned responses menu';
 $labels['arialabelattachmentuploadform'] = 'Attachment upload form';
 $labels['arialabelattachmentmenu'] = 'Attachment options';
+$labels['arialabelmailtomenu'] = 'Email address options';
 $labels['arialabelattachmentpreview'] = 'Attachment preview';
 $labels['ariasummarycomposecontacts'] = 'List of contacts and groups to select as recipients';
 $labels['arialabelcontactexportoptions'] = 'Contact export options';
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 5ea437b78..2a9762253 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -276,7 +276,9 @@ function rcmail_message_buttons()
     $dbox  = $RCMAIL->config->get('drafts_mbox');
 
     // the message is not a draft
-    if ($MESSAGE->folder != $dbox && strpos($MESSAGE->folder, $dbox.$delim) !== 0) {
+    if ($MESSAGE->context
+        || ($MESSAGE->folder != $dbox && strpos($MESSAGE->folder, $dbox.$delim) !== 0)
+    ) {
         return '';
     }
 
@@ -522,7 +524,7 @@ function rcmail_message_summary($attrib)
         return;
     }
 
-    $header = rcmail_message_list_smart_column_name();
+    $header = $MESSAGE->context ? 'from' : rcmail_message_list_smart_column_name();
     $label  = 'shortheader' . $header;
     $date   = $RCMAIL->format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long', 'x'));
     $user   = $MESSAGE->headers->$header;