diff --git a/imp/lib/Dynamic/Message.php b/imp/lib/Dynamic/Message.php
index 31f218024ab..92b78d01e4a 100644
--- a/imp/lib/Dynamic/Message.php
+++ b/imp/lib/Dynamic/Message.php
@@ -39,6 +39,8 @@ protected function _init()
 
         $page_output->addScriptPackage('IMP_Script_Package_Imp');
 
+        $page_output->addThemeStylesheet('message.css');
+
         $js_vars = array();
 
         switch ($this->vars->actionID) {
diff --git a/imp/package.xml b/imp/package.xml
index 0a3f4164b3f..4d45271f0d7 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -997,6 +997,7 @@
      </dir> <!-- /themes/default/block -->
      <dir name="dynamic">
       <file name="compose.css" role="horde" />
+      <file name="message.css" role="horde" />
       <file name="screen.css" role="horde" />
      </dir> <!-- /themes/default/dynamic -->
      <dir name="graphics">
@@ -2025,6 +2026,7 @@
    <install as="imp/themes/default/screen.css" name="themes/default/screen.css" />
    <install as="imp/themes/default/block/screen.css" name="themes/default/block/screen.css" />
    <install as="imp/themes/default/dynamic/compose.css" name="themes/default/dynamic/compose.css" />
+   <install as="imp/themes/default/dynamic/message.css" name="themes/default/dynamic/message.css" />
    <install as="imp/themes/default/dynamic/screen.css" name="themes/default/dynamic/screen.css" />
    <install as="imp/themes/default/graphics/addressbook_browse.png" name="themes/default/graphics/addressbook_browse.png" />
    <install as="imp/themes/default/graphics/add_contact.png" name="themes/default/graphics/add_contact.png" />
diff --git a/imp/themes/default/dynamic/message.css b/imp/themes/default/dynamic/message.css
new file mode 100644
index 00000000000..3c57db334eb
--- /dev/null
+++ b/imp/themes/default/dynamic/message.css
@@ -0,0 +1,47 @@
+.msgfullread div.messageBody {
+    overflow: auto;
+}
+.msgfullread div.subject {
+    font-size: 120%;
+    font-weight: bold;
+    max-height: 50px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    padding-bottom: 5px;
+}
+.msgfullread .msgHeaders {
+    cursor: default;
+}
+.msgfullread .msgHeaders table thead td.label {
+    padding-left: 3px;
+}
+div.msgfullread span.messagePrintShow {
+    display: none;
+}
+#msgHeaderAtc td.label a {
+    font-weight: normal;
+    padding-right: 2px;
+}
+.headercloseimg {
+    cursor: pointer;
+    float: right !important;
+    margin-top: 6px;
+}
+
+@media print {
+    /* Hide UI elements when printing message in popup window. */
+    div.msgfullread div.dimpOptions,
+    div.msgfullread div.mimePartInfo a.iconImg,
+    div.msgfullread span.messagePrintNoShow {
+        display: none;
+    }
+
+    div.msgfullread span.messagePrintShow {
+        display: inline;
+    }
+
+    div.msgfullread div.messageBody{
+        height: auto !important;
+        overflow: visible;
+    }
+}
diff --git a/imp/themes/default/dynamic/screen.css b/imp/themes/default/dynamic/screen.css
index 943c5ce96da..7375ffa9cef 100644
--- a/imp/themes/default/dynamic/screen.css
+++ b/imp/themes/default/dynamic/screen.css
@@ -396,9 +396,6 @@ div.vpRowVert div.msgSubject {
 .msgHeaders a {
     color: #000;
 }
-.msgfullread .msgHeaders {
-    cursor: default;
-}
 
 .msgHeaders table thead td.label {
     display: block;
@@ -407,19 +404,12 @@ div.vpRowVert div.msgSubject {
     text-align: right;
     white-space: nowrap;
 }
-.msgfullread .msgHeaders table thead td.label {
-    padding-left: 3px;
-}
 .msgHeaders .subject {
     font-weight: bold;
 }
 #msgHeaderAtc td.label {
     display: table-cell;
 }
-#msgHeaderAtc td.label a {
-    font-weight: normal;
-    padding-right: 2px;
-}
 
 .atcLabel, .msgLogLabel {
     font-weight: bold;
@@ -474,21 +464,6 @@ div.vpRowVert div.msgSubject {
 .messageBody {
     padding: 10px;
 }
-.msgfullread div.messageBody {
-    overflow: auto;
-}
-.msgfullread div.subject {
-    font-size: 120%;
-    font-weight: bold;
-    max-height: 50px;
-    overflow-x: hidden;
-    overflow-y: auto;
-    padding-bottom: 5px;
-}
-
-div.msgfullread span.messagePrintShow {
-    display: none;
-}
 
 /* Context Menus */
 .context div.contactAddr, .context div.mboxName {
@@ -824,21 +799,3 @@ span.readonlyImg {
 .imp-forward, .imp-redirect {
     background-image: url("../graphics/forwarded.png");
 }
-
-@media print {
-    /* Hide UI elements when printing message in popup window. */
-    div.msgfullread div.dimpOptions,
-    div.msgfullread div.mimePartInfo a.iconImg,
-    div.msgfullread span.messagePrintNoShow {
-        display: none;
-    }
-
-    div.msgfullread span.messagePrintShow {
-        display: inline;
-    }
-
-    div.msgfullread div.messageBody{
-        height: auto !important;
-        overflow: visible;
-    }
-}