diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 9477c150c..d229ba895 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -7,19 +7,23 @@
     xmlns:label="OGo:label"
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
   <div id="messageEditor">
+<md-content class="md-padding">
     <form>
       <div class="PseudoField">
         <label class="PseudoField-label">
           <var:string label:value="From"/>
         </label>
-        <select name="from"
-                data-ng-model="message.editable.from"
-                data-ng-options="identity for identity in identities"><!-- from --></select>
+        <div class="pseudoInput-text">
+          <select name="from"
+                  data-ng-model="message.editable.from"
+                  data-ng-options="identity for identity in identities"><!-- from --></select>
+        </div>
+
       </div>
 
       <div class="PseudoField">
         <label class="PseudoField-label">
-         <var:string label:value="To"/>
+          <var:string label:value="To"/>
         </label>
         <div class="pseudoInput-text">
           <tags-input type="text" name="to"
@@ -47,7 +51,7 @@
           <var:string label:value="Subject"/>
         </label>
 
-          <input type="text" name="subject" ng-model="message.editable.subject" />
+        <input type="text" name="subject" ng-model="message.editable.subject"/>
 
       </md-input-container>
 
@@ -67,18 +71,27 @@
           <span ng-bind="item.filename"><!-- filename --></span>
         </li>
         <li ng-repeat="item in uploader.queue">
-          <span ng-bind="item.file.name"><!-- filename --></span> (<span ng-bind="item.file.progress"><!-- progress --></span>)
+          <span ng-bind="item.file.name"><!-- filename --></span>
+          (<span ng-bind="item.file.progress"><!-- progress --></span>)
         </li>
       </ul>
       <textarea name="content" var:class="editorClass" ng-model="message.editable.text"/>
       <div class="buttonsToolbar">
         <span>
           <a class="button tiny radius"
-             data-ng-click="message.$save()"><i class="icon-disk"><!-- send --></i> <var:string label:value="Save"/></a>
+             data-ng-click="message.$save()">
+            <i class="icon-disk"><!-- send --></i>
+            <var:string label:value="Save"/>
+          </a>
           <a class="button tiny radius"
-             data-ng-click="send(message)"><i class="icon-mail"><!-- send --></i> <var:string label:value="Send"/></a>
+             data-ng-click="send(message)">
+            <i class="icon-mail"><!-- send --></i>
+            <var:string label:value="Send"/>
+          </a>
         </span>
       </div>
     </form>
   </div>
-</container>
+</md-content>
+
+    </container>
diff --git a/UI/WebServerResources/scss/core/typography/typography.scss b/UI/WebServerResources/scss/core/typography/typography.scss
index 57fa757f8..4157244ac 100644
--- a/UI/WebServerResources/scss/core/typography/typography.scss
+++ b/UI/WebServerResources/scss/core/typography/typography.scss
@@ -327,8 +327,6 @@ $h6-margin-Base: 0;
     font-size: $sg-font-size-6;
     line-height: $lineHeight;
     font-weight: $sg-font-regular;
-    margin-top: ($lineHeight * -1);
-    margin-bottom: $lineHeight;
   }
   .#{$md}-display-2 {
     $lineHeight: $sg-line-height-7;
diff --git a/UI/WebServerResources/scss/views/MessageEditorUI.scss b/UI/WebServerResources/scss/views/MessageEditorUI.scss
new file mode 100644
index 000000000..10181868a
--- /dev/null
+++ b/UI/WebServerResources/scss/views/MessageEditorUI.scss
@@ -0,0 +1,13 @@
+////
+/// SOGo
+/// Version: #{}
+/// Module: 
+/// Main definitions for 
+////
+
+[id=messageEditor] {
+  width: 13 *$pitch;
+  margin: 0 auto;
+  background-color: sg-color($sogoPaper, 100);
+
+}
\ No newline at end of file
diff --git a/UI/WebServerResources/scss/views/_view.scss b/UI/WebServerResources/scss/views/_view.scss
index 41ff820f5..f1360a849 100644
--- a/UI/WebServerResources/scss/views/_view.scss
+++ b/UI/WebServerResources/scss/views/_view.scss
@@ -7,6 +7,8 @@
 ///
 
 @import 'MailerUI.scss';
+// @import 'ContactsUI.scss';
+@import 'MessageEditorUI';
 
 .view[layout=row] {
   max-height: 100%;