diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index f855d8306..20669ba68 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -44,8 +44,8 @@
       </div>
     </div>
 
-    <md-dialog-content class="md-padding">
-      <header>
+    <md-dialog-content>
+      <header class="md-padding">
         <div class="msg-header-content">
 
           <!-- to -->
@@ -209,9 +209,11 @@
       </header>
 
       <!-- MESSAGE CONTENT -->
-      <textarea name="content" var:class="editorClass"
-                ck-locale="editor.localeCode"
-                ng-model="editor.message.editable.text"/>
+      <div var:class="editorClass">
+        <textarea name="content" var:class="editorClass"
+                  ck-locale="editor.localeCode"
+                  ng-model="editor.message.editable.text"/>
+      </div>
     </md-dialog-content>
 
     <!-- TOOLBAR BUTTONS -->
diff --git a/UI/WebServerResources/scss/views/MessageEditorUI.scss b/UI/WebServerResources/scss/views/MessageEditorUI.scss
index e8611379b..9fe5fbd95 100644
--- a/UI/WebServerResources/scss/views/MessageEditorUI.scss
+++ b/UI/WebServerResources/scss/views/MessageEditorUI.scss
@@ -29,8 +29,10 @@ textarea.ck-editor {
   margin-top: $mg;
 }
 // Plain text editor
-textarea.plain-text {
-  width: 100%;
-  min-height: grid-step(3);
-  margin-top: $mg;
-}
+div.plain-text {
+  @extend .md-padding;
+  textarea {
+    width: 100%;
+    min-height: grid-step(3);
+  }
+}
\ No newline at end of file