Tweak MIMP message display

diff --git a/imp/message-mimp.php b/imp/message-mimp.php
index 02a83b8..bda856c 100644 (file)
--- a/imp/message-mimp.php
+++ b/imp/message-mimp.php
@@ -172,6 +172,14 @@ $user_identity = $injector->getInstance('IMP_Identity');
 $basic_headers = $imp_ui->basicHeaders();
 $display_headers = $msgAddresses = array();
 
+if (($subject = $mime_headers->getValue('subject'))) {
+    /* Filter the subject text, if requested. */
+    $subject = Horde_String::truncate(IMP::filterText($subject), 50);
+} else {
+    $subject = _("[No Subject]");
+}
+$display_headers['subject'] = $subject;
+
 $format_date = $imp_ui->getLocalTime($envelope['date']);
 if (!empty($format_date)) {
     $display_headers['date'] = $format_date;
@@ -189,15 +197,6 @@ foreach (array('to', 'cc', 'bcc') as $val) {
     }
 }
 
-/* Process the subject now. */
-if (($subject = $mime_headers->getValue('subject'))) {
-    /* Filter the subject text, if requested. */
-    $subject = Horde_String::truncate(IMP::filterText($subject), 50);
-} else {
-    $subject = _("[No Subject]");
-}
-$display_headers['subject'] = $subject;
-
 /* Check for the presence of mailing list information. */
 $list_info = $imp_ui->getListInformation($mime_headers);
 
@@ -353,7 +352,7 @@ foreach ($inlineout['atc_parts'] as $key) {
 $t->set('atc', $atc);
 
 $title = $display_headers['subject'];
-$t->set('title', ($status ? $status . ' | ' : '') . $display_headers['subject'] . ' ' . sprintf(_("(%d of %d)"), $msgindex, $msgcount));
+$t->set('title', ($status ? $status . ' ' : '') . sprintf(_("(Message %d of %d)"), $msgindex, $msgcount));
 
 require IMP_TEMPLATES . '/common-header.inc';
 IMP::status();

diff --git a/imp/templates/mimp/message/message.html b/imp/templates/mimp/message/message.html
index bab0552..a9c403f 100644 (file)
--- a/imp/templates/mimp/message/message.html
+++ b/imp/templates/mimp/message/message.html
@@ -1,5 +1,6 @@
-  <div><tag:title /></div>
-  <hr />
+  <p>
+   <div><tag:title /></div>
+  </p>
   <p>
 <loop:hdrs>
    <div><em><tag:hdrs.label />:</em> <tag:hdrs.val /><if:hdrs.all_to> [<a href="<tag:hdrs.all_to />"><gettext>Show All</gettext></a>]</if:hdrs.all_to></div>
@@ -16,6 +17,9 @@
    </div>
 </loop:atc>
   </p>
+  <p>
+   <hr />
+  </p>
   <p class="fixed">
    <tag:msg />
   </p>