diff --git a/mail/templates/default/folder_management.xet b/mail/templates/default/folder_management.xet
index 8e90351100..bc465a0e79 100644
--- a/mail/templates/default/folder_management.xet
+++ b/mail/templates/default/folder_management.xet
@@ -6,7 +6,7 @@
 			<et2-description  value="Folder Management" class="mail_folder_management_header"></et2-description>
 		</et2-hbox>
 		<et2-hbox  class="treeContainer">
-			<tree id="tree" multiple="true" autoloading="mail_ui::ajax_folderMgmtTree_autoloading" multimarking="strict" oncheck="app.mail.folderMgmt_onCheck" onselect="app.mail.folderMgmt_onSelect" onopenstart="app.mail.folderMgmt_autoloadingStart" onopenend="app.mail.folderMgmt_autoloadingEnd" highlighting="true"/>
+			<et2-tree-multiple id="tree" multiple="true" autoloading="mail_ui::ajax_folderMgmtTree_autoloading" multimarking="strict" oncheck="app.mail.folderMgmt_onCheck" onselect="app.mail.folderMgmt_onSelect" onopenstart="app.mail.folderMgmt_autoloadingStart" onopenend="app.mail.folderMgmt_autoloadingEnd" highlighting="true"/>
 		</et2-hbox>
 		<et2-hbox  class="dialogFooterToolbar">
 			<et2-button  statustext="Delete" label="Delete" id="button[delete]" onclick="app.mail.folderMgmt_deleteBtn"></et2-button>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index f224c832c1..3d21234110 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -137,9 +137,9 @@
         </et2-hbox>
     </template>
     <template id="mail.index" template="" lang="" group="0" version="1.9.001">
-        <tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder"
-              parent_node="mail-tree_target" onopenstart="app.mail.subscription_autoloadingStart"
-              onopenend="app.mail.subscription_autoloadingEnd" highlighting="true"/>
+        <et2-tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder"
+                  onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd"
+                  highlighting="true" parentId="mail-tree_target"/>
         <template id="splitter" height="100%" template="mail.index.splitter"/>
         <iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
     </template>
diff --git a/mail/templates/default/subscribe.xet b/mail/templates/default/subscribe.xet
index 31ed85a594..e9b43760a4 100755
--- a/mail/templates/default/subscribe.xet
+++ b/mail/templates/default/subscribe.xet
@@ -6,7 +6,7 @@
 			<et2-description  value="Subscription folders" class="mail_subscription_header"></et2-description>
 		</et2-hbox>
 		<et2-hbox  class="treeContainer">
-			<tree id="foldertree" multiple="true" autoloading="mail_ui::ajax_tree_autoloading" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd" multimarking="strict" highlighting="true" oncheck="app.mail.folderMgmt_onCheck" onselect="app.mail.folderMgmt_onSelect"/>
+			<et2-tree-multiple id="foldertree" multiple="true" autoloading="mail_ui::ajax_tree_autoloading" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd" multimarking="strict" highlighting="true" oncheck="app.mail.folderMgmt_onCheck" onselect="app.mail.folderMgmt_onSelect"/>
 		</et2-hbox>
 		<et2-hbox  class="dialogFooterToolbar">
 			<et2-button  statustext="Saves subscription changes" label="Save" id="button[save]"></et2-button>
diff --git a/mail/templates/mobile/index.xet b/mail/templates/mobile/index.xet
index ab21c037c5..b1b0359e45 100644
--- a/mail/templates/mobile/index.xet
+++ b/mail/templates/mobile/index.xet
@@ -42,7 +42,7 @@
 		<et2-hbox  class="mail-index_quotabox"><progress id="nm[quotainpercent]" label="@nm[quota]" class="@nm[quotaclass]"/></et2-hbox>
 	</template>
 	<template id="mail.index" template="" lang="" group="0" version="1.9.001">
-		<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target"/>
+		<et2-tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target"/>
 		<html id="msg"/>
 		<et2-hbox  class="mail-index_vacation"><et2-vbox>
 			<et2-description  id="nm[vacationnotice]" class="@nm[vacationclass]"></et2-description>
diff --git a/mail/templates/mobile/subscribe.xet b/mail/templates/mobile/subscribe.xet
index 300106f480..54673f7ab3 100644
--- a/mail/templates/mobile/subscribe.xet
+++ b/mail/templates/mobile/subscribe.xet
@@ -24,7 +24,7 @@
 				</row>
 				<row>
 					<et2-box  scrolling="auto">
-						<tree id="foldertree" multiple="true" autoloading="mail_ui::ajax_tree_autoloading" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd"/>
+						<et2-tree id="foldertree" multiple="true" autoloading="mail_ui::ajax_tree_autoloading" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd"/>
 					</et2-box>
 				</row>
 			</rows>