diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index d4d677b29..9477c150c 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -8,52 +8,59 @@
     xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
   <div id="messageEditor">
     <form>
-
-        <label>
+      <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>
 
-
-      <md-input-container>
-        <label>
-          <var:string label:value="To"/>
-          <input type="text" name="to"
+      <div class="PseudoField">
+        <label class="PseudoField-label">
+         <var:string label:value="To"/>
+        </label>
+        <div class="pseudoInput-text">
+          <tags-input type="text" name="to"
                       ng-model="message.editable.to"
                       label:placeholder="Add a recipient">
             <auto-complete data-source="userFilter($query)"><!-- to --></auto-complete>
-          </input>
-        </label>
-      </md-input-container>
-
-      <md-input-container>
-        <label>
+          </tags-input>
+        </div>
+      </div>
+      <div class="PseudoField">
+        <label class="PseudoField-label">
           <var:string label:value="Cc"/>
         </label>
-          <input type="text" name="cc"
+        <div class="pseudoInput-text">
+          <tags-input type="text" name="cc"
                       ng-model="message.editable.cc"
                       label:placeholder="Add a recipient">
             <auto-complete data-source="userFilter($query)"><!-- to --></auto-complete>
-          </input>
-      </md-input-container>
+          </tags-input>
+        </div>
+      </div>
 
       <md-input-container>
         <label>
           <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>
 
-      <md-input-container>
-        <label>
+      <div class="PseudoField">
+        <label class="PseudoField-label">
           <var:string label:value="Attachments"/>
         </label>
+        <div class="pseudoInput-text">
           <input type="file"
                  data-nv-file-select="nv-file-select"
                  data-uploader="uploader"/>
-      </md-input-container>
+        </div>
+      </div>
 
       <ul>
         <li ng-repeat="item in message.editable.attachmentAttrs">
@@ -63,10 +70,7 @@
           <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"/>
-
-
+      <textarea name="content" var:class="editorClass" ng-model="message.editable.text"/>
       <div class="buttonsToolbar">
         <span>
           <a class="button tiny radius"