diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index cb07c2347..61d10da7f 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     xmlns:uix="OGo:uix">
   <md-dialog flex="50" flex-sm="100">
-    <md-content>
+    <md-dialog-content>
       <md-input-container md-no-float="md-no-float" layout="row">
         <i class="md-icon-search"><!--icon--></i>
         <input ng-model="searchString" type="text" placeholder="Name" sg-user-typeahead="sg-user-typeahead"/>
@@ -51,6 +51,6 @@
           <md-divider ng-if="!$last"><!-- divider --></md-divider>
         </md-list-item>
       </md-list>
-    </md-content>
+    </md-dialog-content>
   </md-dialog>
 </container>
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index 9c72aded6..c37b7c1da 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -10,7 +10,7 @@
     className="UIxPageFrame"
     >
   <md-dialog>
-    <md-content>
+    <md-dialog-content>
 
       <form id="mainForm" name="accountForm" var:href="ownPath">
 
@@ -116,6 +116,6 @@
         </div>
 
       </form>
-    </md-content>
+    </md-dialog-content>
   </md-dialog>
 </var:component>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index b24b3c739..347954623 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -10,80 +10,80 @@
   className="UIxPageFrame"
   >
   <md-dialog>
-  <md-content>
-  <script type="text/javascript">
-    var filterId = '<var:string value="filterId"/>';
-    var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
-    var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
-  </script>
-  <form id="mainForm" var:href="ownPath">
-    <div id="filterNameContainer" class="container">
-      <md-input-container>
-        <label><var:string label:value="Filter name:"/></label>
-        <input const:name="filterName" type="text" ng-model="filter.name"/>
-      </md-input-container>
-    </div>
-    <div id="filterMatchContainer" class="container">
-      <var:string label:value="For incoming messages that"/>
-      <md-select const:name="matchType" const:id="matchType" ng-model="filter.match">
-        <md-option const:value="all">
-          <var:string label:value="match all of the following rules:"/>
-        </md-option>
-        <md-option const:value="any">
-          <var:string label:value="match any of the following rules:"/>
-        </md-option>
-        <md-option const:value="allmessages">
-          <var:string label:value="match all messages"/>
-        </md-option>
-      </md-select>
-    </div>
+    <md-dialog-content>
+      <script type="text/javascript">
+        var filterId = '<var:string value="filterId"/>';
+        var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
+        var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
+      </script>
+      <form id="mainForm" var:href="ownPath">
+        <div id="filterNameContainer" class="container">
+          <md-input-container>
+            <label><var:string label:value="Filter name:"/></label>
+            <input const:name="filterName" type="text" ng-model="filter.name"/>
+          </md-input-container>
+        </div>
+        <div id="filterMatchContainer" class="container">
+          <var:string label:value="For incoming messages that"/>
+          <md-select const:name="matchType" const:id="matchType" ng-model="filter.match">
+            <md-option const:value="all">
+              <var:string label:value="match all of the following rules:"/>
+            </md-option>
+            <md-option const:value="any">
+              <var:string label:value="match any of the following rules:"/>
+            </md-option>
+            <md-option const:value="allmessages">
+              <var:string label:value="match all messages"/>
+            </md-option>
+          </md-select>
+        </div>
 
-    <!-- CONDITIONS -->
-    <div id="filterRulesContainer" class="container">
-      <div id="filterRules"><!-- empty -->
-        <md-list>
-          <md-list-item ng-repeat="rule in filter.rules">
-              <md-select ng-model="rule.field">
-                <md-option ng-value="key" ng-repeat="(key, value) in fieldLabels">{{ value }}</md-option>
-              </md-select>
+        <!-- CONDITIONS -->
+        <div id="filterRulesContainer" class="container">
+          <div id="filterRules"><!-- empty -->
+            <md-list>
+              <md-list-item ng-repeat="rule in filter.rules">
+                <md-select ng-model="rule.field">
+                  <md-option ng-value="key" ng-repeat="(key, value) in fieldLabels">{{ value }}</md-option>
+                </md-select>
 
-              <input type="text" ng-show="rule.field ==
-                                                      'header'" ng-model="rule.custom_header"/>
+                <input type="text" ng-show="rule.field ==
+                                            'header'" ng-model="rule.custom_header"/>
 
-              <md-select ng-show="rule.field =='size'" ng-model="rule.operator">
-                <md-option ng-value="key" ng-repeat="(key, value) in numberOperatorLabels">
-                  {{ value }}
-                </md-option>
-              </md-select>
+                <md-select ng-show="rule.field =='size'" ng-model="rule.operator">
+                  <md-option ng-value="key" ng-repeat="(key, value) in numberOperatorLabels">
+                    {{ value }}
+                  </md-option>
+                </md-select>
 
-              <md-select ng-show="rule.field !='size'" ng-model="rule.operator">
-                <md-option ng-value="key" ng-repeat="(key, value) in textOperatorLabels">
-                  {{ value }}
-                </md-option>
-              </md-select>
+                <md-select ng-show="rule.field !='size'" ng-model="rule.operator">
+                  <md-option ng-value="key" ng-repeat="(key, value) in textOperatorLabels">
+                    {{ value }}
+                  </md-option>
+                </md-select>
 
-              <input type="text" ng-model="rule.value"/>
+                <input type="text" ng-model="rule.value"/>
 
-              <md-button ng-click="removeMailFilterRule($index)" type="button">
-                <div class="md-icon-remove"><!-- delete --></div>
-              </md-button>
-              
-          </md-list-item>
-        </md-list>
-      </div>
+                <md-button ng-click="removeMailFilterRule($index)" type="button">
+                  <div class="md-icon-remove"><!-- delete --></div>
+                </md-button>
 
-        <md-button ng-click="addMailFilterRule($event)" type="button">
-          <div class="md-icon-add"><!-- create --></div>
-        </md-button>
-    </div>
+              </md-list-item>
+            </md-list>
+          </div>
 
-    <!-- ACTIONS -->
-    <div id="filterActionsContainer" class="container">
-      <var:string label:value="Perform these actions:"/><br/>
-      <div id="filterActions"><!-- empty --></div>
+          <md-button ng-click="addMailFilterRule($event)" type="button">
+            <div class="md-icon-add"><!-- create --></div>
+          </md-button>
+        </div>
 
-        <md-list>
-          <md-list-item ng-repeat="action in filter.actions">
+        <!-- ACTIONS -->
+        <div id="filterActionsContainer" class="container">
+          <var:string label:value="Perform these actions:"/><br/>
+          <div id="filterActions"><!-- empty --></div>
+
+          <md-list>
+            <md-list-item ng-repeat="action in filter.actions">
               <md-select ng-model="action.method">
                 <md-option ng-value="key" ng-repeat="(key, value) in methodLabels">{{ value }}</md-option>
               </md-select>
@@ -119,20 +119,20 @@
               <md-button ng-click="removeMailFilterAction($index)" type="button">
                 <div class="md-icon-remove"><!-- delete --></div>
               </md-button>
-              
+
           </md-list-item>
-        </md-list>
+          </md-list>
 
-      <md-button ng-click="addMailFilterAction($event)" type="button">
-        <div class="md-icon-add"><!-- create --></div>
-      </md-button>
-    </div>
+          <md-button ng-click="addMailFilterAction($event)" type="button">
+            <div class="md-icon-add"><!-- create --></div>
+          </md-button>
+        </div>
 
-    <div class="md-actions" layout="row">
-      <md-button type="button" ng-click="cancel()">Cancel</md-button>
-      <md-button type="button" class="md-primary" ng-click="save()">Save</md-button>
+        <div class="md-actions" layout="row">
+          <md-button type="button" ng-click="cancel()">Cancel</md-button>
+          <md-button type="button" class="md-primary" ng-click="save()">Save</md-button>
       </div>
-  </form>
-  </md-content>
-  </md-dialog>
+    </form>
+  </md-dialog-content>
+</md-dialog>
 </var:component>
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index b393ee5c1..c13e4b370 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -7,7 +7,7 @@
     xmlns:label="OGo:label"
     xmlns:uix="OGo:uix">
   <md-dialog>
-    <md-content>
+    <md-dialog-content>
       <md-subheader><var:string label:value="Access Rights"/> - {{stateAddressbook.name}}</md-subheader>
       
       <md-list>
@@ -70,7 +70,7 @@
         <md-button ng-click="closeModal()"><var:string label:value="Close"/></md-button>
         <md-button ng-click="saveModal()"><var:string label:value="Save"/></md-button>
       </div>
-    </md-content>
+    </md-dialog-content>
   </md-dialog>
   
 </container>
diff --git a/UI/WebServerResources/js/ContactsUI.js b/UI/WebServerResources/js/ContactsUI.js
index c533f3992..859fd238b 100644
--- a/UI/WebServerResources/js/ContactsUI.js
+++ b/UI/WebServerResources/js/ContactsUI.js
@@ -123,7 +123,7 @@
           escapeToClose: true,
           template:
           '<md-dialog aria-label="' + l('New addressbook') + '">' +
-            '  <md-content layout="column">' +
+            '  <md-dialog-content layout="column">' +
             '    <md-input-container>' +
             '      <label>' + l('Name of new addressbook') + '</label>' +
             '      <input type="text" ng-model="name" required="required"/>' +
@@ -136,7 +136,7 @@
             '        OK' +
             '      </md-button>' +
             '    </div>'+
-            '  </md-content>' +
+            '  </md-dialog-content>' +
             '</md-dialog>',
           controller: NewAddressBookDialogController
         });
diff --git a/UI/WebServerResources/js/SchedulerUI.js b/UI/WebServerResources/js/SchedulerUI.js
index 4b1276aac..771441a9c 100644
--- a/UI/WebServerResources/js/SchedulerUI.js
+++ b/UI/WebServerResources/js/SchedulerUI.js
@@ -141,7 +141,7 @@
           escapeToClose: true,
           template:
           '<md-dialog aria-label="' + l('New calendar') + '">' +
-            '  <md-content layout="column">' +
+            '  <md-dialog-content layout="column">' +
             '    <md-input-container>' +
             '      <label>' + l('Name of the Calendar') + '</label>' +
             '      <input type="text" ng-model="name" required="required"/>' +
@@ -154,7 +154,7 @@
             '        OK' +
             '      </md-button>' +
             '    </div>'+
-            '  </md-content>' +
+            '  </md-dialog-content>' +
             '</md-dialog>',
           controller: NewCalendarDialogController
         });