diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 34fbf1590..65086f0d5 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -24,9 +24,13 @@
   </var:if><var:if condition="verticalDragHandleStyle">
     DIV#rightDragHandle, DIV#messageContent
      { top: <var:string value="verticalDragHandleStyle" />; }
-  </var:if><var:if condition="mailboxContentStyle">
+  </var:if><var:if condition="singleWindowModeEnabled" const:negate="YES"><var:if condition="mailboxContentStyle">
     DIV#mailboxContent
      { height: <var:string value="mailboxContentStyle" />; }
+  </var:if></var:if><var:if condition="singleWindowModeEnabled">
+    DIV#mailboxContent
+     { height: auto;
+       bottom: 0px; }
   </var:if>
   </style>
   
@@ -306,8 +310,10 @@
   </table>
 </div>
     </div>
-    <div class="dragHandle" id="rightDragHandle"><!-- space --></div>
-    <div id="messageContent"><!-- space --></div>
+    <var:if condition="singleWindowModeEnabled" const:negate="YES"
+      ><div class="dragHandle" id="rightDragHandle"><!-- space --></div>
+      <div id="messageContent"><!-- space --></div
+    ></var:if>
   </div>
 
   <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index a8dc5beb3..2943db290 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -42,7 +42,9 @@
 
       <body var:class="bodyClasses"
 	><var:if condition="isCompatibleBrowser"
-	  ><var:if condition="shortUserNameForDisplay" const:value="anonymous"
+	  ><var:if condition="singleWindowModeEnabled"
+          ><div id="popupFrame" style="display: none;"><iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe></div></var:if
+          ><var:if condition="shortUserNameForDisplay" const:value="anonymous"
             const:negate="YES"><var:if condition="hasUserSettingsKeys"
               ><script type="text/javascript">
                 var UserSettings = <var:string value="userSettings" const:escapeHTML="NO"/>;
