diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 87826311b..229a502b1 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -1,58 +1,59 @@
 <?xml version='1.0' standalone='yes'?>
-  <var:component
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:uix="OGo:uix"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxPageFrame"
-    title="panelTitle"
-    const:popup="YES">
-    <div class="menu" id="attachmentsMenu">
-      <ul>
-        <li><var:string label:value="Open"/></li>
-        <li><var:string label:value="Delete" /></li>
-        <li><var:string label:value="Select All" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Attach File(s)..." /></li>
-        <li><var:string label:value="Attach Web Page..." /></li>
-      </ul>
-    </div>
+<!DOCTYPE var:component>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxPageFrame"
+  title="panelTitle"
+  const:popup="YES">
+  <div class="menu" id="attachmentsMenu">
+    <ul>
+      <li><var:string label:value="Open"/></li>
+      <li><var:string label:value="Delete" /></li>
+      <li><var:string label:value="Select All" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Attach File(s)..." /></li>
+      <li><var:string label:value="Attach Web Page..." /></li>
+    </ul>
+  </div>
 
-    <form name="pageform" enctype="multipart/form-data">
-      <div id="headerArea">
-        <div id="attachmentsArea">
-          <var:string label:value="Attachments:" />
-          <ul id="attachments">
-            <var:foreach list="attachmentNames" item="attachmentName"
-	      ><img rsrc:img="attachment.gif"
-		/><var:string value="attachmentName"
-		/></var:foreach>
-	  </ul>
-        </div>
-        <span class="headerField"><var:string label:value="From" />:</span>
-        <var:popup const:name="from"
-          list="fromEMails"
-          item="item"
-          selection="from"
-          /><br />
-        <div>
-          <var:component className="UIxMailToSelection"
-            to="to" cc="cc" bcc="bcc" />
-        </div>
-        <div class="addressListElement" id="subjectRow"
-          ><span class="headerField"><var:string label:value="Subject"
-              />:</span
-            ><span class="headerInput"
-            ><input name="subject"
-              type="text"
-              class="textField"
-              var:value="subject"
-              /></span></div>
+  <form name="pageform" enctype="multipart/form-data">
+    <div id="headerArea">
+      <div id="attachmentsArea">
+	<var:string label:value="Attachments:" />
+	<ul id="attachments">
+	  <var:foreach list="attachmentNames" item="attachmentName"
+	    ><img rsrc:img="attachment.gif"
+	      /><var:string value="attachmentName"
+	      /></var:foreach>
+	</ul>
       </div>
+      <span class="headerField"><var:string label:value="From" />:</span>
+      <var:popup const:name="from"
+	list="fromEMails"
+	item="item"
+	selection="from"
+	/><br />
+      <div>
+	<var:component className="UIxMailToSelection"
+	  to="to" cc="cc" bcc="bcc" />
+      </div>
+      <div class="addressListElement" id="subjectRow"
+	><span class="headerField"><var:string label:value="Subject"
+	    />:</span
+	  ><span class="headerInput"
+	  ><input name="subject"
+	    type="text"
+	    class="textField"
+	    var:value="subject"
+	    /></span></div>
+    </div>
     <!-- separator line -->
-      <textarea name="text" rows="30" var:value="text" />
+    <textarea name="text" rows="30" var:value="text" />
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
-    </form>
-  </var:component>
+  </form>
+</var:component>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 47c56d985..e389db9c0 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -1,167 +1,167 @@
 <?xml version="1.0" standalone="yes"?>
-  <var:component xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    xmlns:label="OGo:label"
-    className="UIxPageFrame"
-    title="title"
-    popup="isPopup"
-    >
-    <script type="text/javascript" rsrc:src="dtree.js"><!-- space --></script>
-    <script type="text/javascript" rsrc:src="MailerUI+dTree.js"><!-- space --></script>
-    <script type="text/javascript">
-      var mailAccounts = '<var:string value="mailAccounts" const:escapeHTML="NO"/>'.evalJSON(true);
-    </script>
-    <div class="menu" id="accountIconMenu">
-      <ul>
-        <li><var:string label:value="Subscribe..." /></li>
-        <li><var:string label:value="Get Messages for Account" /></li>
-        <li><var:string label:value="New Folder..." /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Properties..." /></li>
-      </ul>
-    </div>
+<!DOCTYPE var:component>
+<var:component xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxPageFrame"
+  title="title"
+  >
+  <script type="text/javascript" rsrc:src="dtree.js"><!-- space --></script>
+  <script type="text/javascript" rsrc:src="MailerUI+dTree.js"><!-- space --></script>
+  <script type="text/javascript">
+    var mailAccounts = '<var:string value="mailAccounts" const:escapeHTML="NO"/>'.evalJSON(true);
+  </script>
+  <div class="menu" id="accountIconMenu">
+    <ul>
+      <li><var:string label:value="Subscribe..." /></li>
+      <li><var:string label:value="Get Messages for Account" /></li>
+      <li><var:string label:value="New Folder..." /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Search Messages..." /></li>
+      <li><var:string label:value="Properties..." /></li>
+    </ul>
+  </div>
 
-    <div class="menu" id="inboxIconMenu">
-      <ul>
-        <li><var:string label:value="Open in New Mail Window" /></li>
-        <li><var:string label:value="Copy Folder Location" /></li>
-        <li><var:string label:value="Subscribe..." /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Mark Folder Read..." /></li>
-        <li><var:string label:value="New Folder..." /></li>
-        <li><var:string label:value="Compact This Folder" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Sharing..." /></li>
-      </ul>
-    </div>
-      
-    <div class="menu" id="trashIconMenu">
-      <ul>
-        <li><var:string label:value="Open in New Mail Window" /></li>
-        <li><var:string label:value="Copy Folder Location" /></li>
-        <li><var:string label:value="Subscribe..." /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Mark Folder Read..." /></li>
-        <li><var:string label:value="New Subfolder..." /></li>
-        <li><var:string label:value="Compact This Folder" /></li>
-        <li><var:string label:value="Empty Trash" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Search Messages..." /></li>
-        <li><var:string label:value="Sharing..." /></li>
-      </ul>
-    </div>
+  <div class="menu" id="inboxIconMenu">
+    <ul>
+      <li><var:string label:value="Open in New Mail Window" /></li>
+      <li><var:string label:value="Copy Folder Location" /></li>
+      <li><var:string label:value="Subscribe..." /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Mark Folder Read..." /></li>
+      <li><var:string label:value="New Folder..." /></li>
+      <li><var:string label:value="Compact This Folder" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Search Messages..." /></li>
+      <li><var:string label:value="Sharing..." /></li>
+    </ul>
+  </div>
+  
+  <div class="menu" id="trashIconMenu">
+    <ul>
+      <li><var:string label:value="Open in New Mail Window" /></li>
+      <li><var:string label:value="Copy Folder Location" /></li>
+      <li><var:string label:value="Subscribe..." /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Mark Folder Read..." /></li>
+      <li><var:string label:value="New Subfolder..." /></li>
+      <li><var:string label:value="Compact This Folder" /></li>
+      <li><var:string label:value="Empty Trash" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Search Messages..." /></li>
+      <li><var:string label:value="Sharing..." /></li>
+    </ul>
+  </div>
 
-    <div class="menu" id="mailboxIconMenu">
-      <ul>
-        <li><var:string label:value="Open in New Mail Window" /></li>
-        <li><var:string label:value="Copy Folder Location" /></li>
-        <li><var:string label:value="Subscribe..." /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Mark Folder Read..." /></li>
-        <li><var:string label:value="New Subfolder..." /></li>
-        <li><var:string label:value="Rename Folder..." /></li>
-        <li><var:string label:value="Compact This Folder" /></li>
-        <li><var:string label:value="Delete Folder" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Search Messages..." /></li>
-	<li><var:string label:value="Sharing..." /></li>
-      </ul>
-    </div>
-    
-    <div class="menu" id="addressMenu">
-      <ul>
-        <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
-        <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
-        <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
-      </ul>
-    </div>
+  <div class="menu" id="mailboxIconMenu">
+    <ul>
+      <li><var:string label:value="Open in New Mail Window" /></li>
+      <li><var:string label:value="Copy Folder Location" /></li>
+      <li><var:string label:value="Subscribe..." /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Mark Folder Read..." /></li>
+      <li><var:string label:value="New Subfolder..." /></li>
+      <li><var:string label:value="Rename Folder..." /></li>
+      <li><var:string label:value="Compact This Folder" /></li>
+      <li><var:string label:value="Delete Folder" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Search Messages..." /></li>
+      <li><var:string label:value="Sharing..." /></li>
+    </ul>
+  </div>
+  
+  <div class="menu" id="addressMenu">
+    <ul>
+      <li id="add_to_addressbook"><var:string label:value="Add to Address Book..."/></li>
+      <li id="compose_mailto"><var:string label:value="Compose Mail To"/></li>
+      <li id="create_filter"><var:string label:value="Create Filter From Message..."/></li>
+    </ul>
+  </div>
 
-    <div class="menu" id="messageListMenu">
-      <ul>
-        <li><var:string label:value="Open Message In New Window"/></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Reply to Sender Only"/></li>
-        <li><var:string label:value="Reply to All"/></li>
-        <li><var:string label:value="Forward"/></li>
-        <li><var:string label:value="Edit As New..."/></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Move To"/></li>
-        <li><var:string label:value="Copy To"/></li>
-        <li><var:string label:value="Label"/></li>
-        <li><var:string label:value="Mark"/></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Save As..."/></li>
-        <li><var:string label:value="View Message Source"/></li>
-        <li><var:string label:value="Print Preview"/></li>
-        <li><var:string label:value="Print..."/></li>
-        <li><var:string label:value="Delete Message"/></li>
-      </ul>
-    </div>
+  <div class="menu" id="messageListMenu">
+    <ul>
+      <li><var:string label:value="Open Message In New Window"/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Reply to Sender Only"/></li>
+      <li><var:string label:value="Reply to All"/></li>
+      <li><var:string label:value="Forward"/></li>
+      <li><var:string label:value="Edit As New..."/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Move To"/></li>
+      <li><var:string label:value="Copy To"/></li>
+      <li><var:string label:value="Label"/></li>
+      <li><var:string label:value="Mark"/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Save As..."/></li>
+      <li><var:string label:value="View Message Source"/></li>
+      <li><var:string label:value="Print Preview"/></li>
+      <li><var:string label:value="Print..."/></li>
+      <li><var:string label:value="Delete Message"/></li>
+    </ul>
+  </div>
 
-    <div class="menu" id="messageContentMenu">
-      <ul>
-        <li><var:string label:value="Reply to Sender Only"/></li>
-        <li><var:string label:value="Reply to All"/></li>
-        <li><var:string label:value="Forward"/></li>
-        <li><var:string label:value="Edit As New..."/></li>
-        <li><var:string label:value="Move To"/></li>
-        <li><var:string label:value="Copy To"/></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Label"/></li>
-        <li><var:string label:value="Mark"/></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Save As..."/></li>
-        <li><var:string label:value="View Message Source"/></li>
-        <li><var:string label:value="Print Preview"/></li>
-        <li><var:string label:value="Print..."/></li>
-        <li><var:string label:value="Delete Message"/></li>
-      </ul>
-    </div>
+  <div class="menu" id="messageContentMenu">
+    <ul>
+      <li><var:string label:value="Reply to Sender Only"/></li>
+      <li><var:string label:value="Reply to All"/></li>
+      <li><var:string label:value="Forward"/></li>
+      <li><var:string label:value="Edit As New..."/></li>
+      <li><var:string label:value="Move To"/></li>
+      <li><var:string label:value="Copy To"/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Label"/></li>
+      <li><var:string label:value="Mark"/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Save As..."/></li>
+      <li><var:string label:value="View Message Source"/></li>
+      <li><var:string label:value="Print Preview"/></li>
+      <li><var:string label:value="Print..."/></li>
+      <li><var:string label:value="Delete Message"/></li>
+    </ul>
+  </div>
 
-    <div class="menu" id="label-menu">
-      <ul id="">
-        <li><var:string label:value="None" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Important" /></li>
-        <li><var:string label:value="Work" /></li>
-        <li><var:string label:value="Personal" /></li>
-        <li><var:string label:value="To Do" /></li>
-        <li><var:string label:value="Later" /></li>
-      </ul>
-    </div>
+  <div class="menu" id="label-menu">
+    <ul id="">
+      <li><var:string label:value="None" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Important" /></li>
+      <li><var:string label:value="Work" /></li>
+      <li><var:string label:value="Personal" /></li>
+      <li><var:string label:value="To Do" /></li>
+      <li><var:string label:value="Later" /></li>
+    </ul>
+  </div>
 
-    <div class="menu" id="mark-menu">
-      <ul id="">
-        <li><var:string label:value="As Read" /></li>
-        <li><var:string label:value="Thread As Read" /></li>
-        <li><var:string label:value="As Read By Date..." /></li>
-        <li><var:string label:value="All Read" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="Flag" /></li>
-        <li><!-- separator --></li>
-        <li><var:string label:value="As Junk" /></li>
-        <li><var:string label:value="As Not Junk" /></li>
-        <li><var:string label:value="Run Junk Mail Controls" /></li>
-      </ul>
-    </div>
+  <div class="menu" id="mark-menu">
+    <ul id="">
+      <li><var:string label:value="As Read" /></li>
+      <li><var:string label:value="Thread As Read" /></li>
+      <li><var:string label:value="As Read By Date..." /></li>
+      <li><var:string label:value="All Read" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Flag" /></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="As Junk" /></li>
+      <li><var:string label:value="As Not Junk" /></li>
+      <li><var:string label:value="Run Junk Mail Controls" /></li>
+    </ul>
+  </div>
 
-    <div id="leftPanel">
-      <div class="titlediv"><var:string label:value="Folders" /></div>
-      <div id="folderTreeContent"><!-- space --></div>
-    </div>
+  <div id="leftPanel">
+    <div class="titlediv"><var:string label:value="Folders" /></div>
+    <div id="folderTreeContent"><!-- space --></div>
+  </div>
 
-    <div class="dragHandle" id="verticalDragHandle"><!-- space --></div>
+  <div class="dragHandle" id="verticalDragHandle"><!-- space --></div>
 
-    <div id="rightPanel">
-      <var:component className="UIxMailFilterPanel" qualifier="qualifier" />
-      <div id="mailboxContent"><!-- space --></div>
-      <div class="dragHandle" id="rightDragHandle"><!-- space --></div>
-      <div id="messageContent"><!-- space --></div>
-    </div>
+  <div id="rightPanel">
+    <var:component className="UIxMailFilterPanel" qualifier="qualifier" />
+    <div id="mailboxContent"><!-- space --></div>
+    <div class="dragHandle" id="rightDragHandle"><!-- space --></div>
+    <div id="messageContent"><!-- space --></div>
+  </div>
 
-    <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
-  </var:component>
+  <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
+</var:component>