Don't display status information in popup.

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/html.php b/framework/Mime/lib/Horde/Mime/Viewer/html.php
index cec0151..9fe3140 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/html.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/html.php
@@ -39,7 +39,7 @@ class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver
         return array(
             $this->_mimepart->getMimeId() => array(
                 'data' => $html['data'],
-                'status' => $html['status'],
+                'status' => array(),
                 'type' => $this->_mimepart->getType(true)
             )
         );
@@ -159,7 +159,7 @@ class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver
 
         /* Get phishing warning. */
         $status = array();
-        if ($phish_warn) {
+        if ($inline && $phish_warn) {
             $phish_warning = sprintf(_("%s: This message may not be from whom it claims to be. Beware of following any links in it or of providing the sender with any personal information.") . ' ' . _("The links that caused this warning have the same background color as this message."), _("Warning"));
             if (!$inline) {
                 $phish_warning = String::convertCharset($phish_warning, NLS::getCharset(), $this->_mimepart->getCharset());

diff --git a/imp/lib/Mime/Viewer/html.php b/imp/lib/Mime/Viewer/html.php
index 82fccaa..655a811 100644 (file)
--- a/imp/lib/Mime/Viewer/html.php
+++ b/imp/lib/Mime/Viewer/html.php
@@ -193,7 +193,8 @@ class IMP_Horde_Mime_Viewer_html extends Horde_Mime_Viewer_html
         }
 
         /* Only display images if specifically allowed by user. */
-        if (!IMP::printMode() &&
+        if ($inline &&
+            !IMP::printMode() &&
             $GLOBALS['prefs']->getValue('html_image_replacement') &&
             preg_match($this->_img_regex, $data)) {
             /* Make sure the URL parameters are correct for the current