diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 3bb977f82..5274586ae 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -49,7 +49,10 @@ if ($uid) {
 
         $OUTPUT->add_handlers(array('dialogcontent' => 'rcmail_headers_output'));
 
-        if (!$inline) {
+        if ($inline) {
+            $OUTPUT->set_env('dialog_class', 'text-nowrap');
+        }
+        else {
             $OUTPUT->command('set_headers', $source);
         }
     }
diff --git a/skins/elastic/templates/dialog.html b/skins/elastic/templates/dialog.html
index f885a547e..40ead4d25 100644
--- a/skins/elastic/templates/dialog.html
+++ b/skins/elastic/templates/dialog.html
@@ -1,6 +1,6 @@
 <roundcube:include file="includes/layout.html" />
 
-<div class="content frame-content">
+<div class="content frame-content <roundcube:var name="env:dialog_class" />">
 	<roundcube:object name="dialogcontent" />
 </div>