diff --git a/styles/styles.min.css b/styles/styles.min.css
index c6b4810..483c011 100644
--- a/styles/styles.min.css
+++ b/styles/styles.min.css
@@ -3646,29 +3646,13 @@ color: var(--font2);
 
 .listing li a,
 .listing tbody td {
-
     white-space: nowrap;
     vertical-align: middle;
     color: #2c363a;
 }
 
 
-
-
-.message  td {
-    font-weight: 400;
-    line-height: 35px;
-	position:relative;
-}
-
-
-
-.listing .flag {
-    padding: 0 0.5rem;
-}
-
 .listing tbody td {
-
     text-overflow: ellipsis;
     outline: 0;
 }
@@ -4275,17 +4259,20 @@ line-height: 2em;
 
 .messagelist td.flags > span {
     height: 2em;
-    line-height: 2em;
+    line-height: 1.7em;
     display: block;
 	font-size:12px;
+	margin-left: -20px;
 }
 
-
-
 .messagelist td.flags > span.flag {
     cursor: pointer;
 }
 
+.messagelist td.flags > span.attachment {
+	transform: translate(0, 2px);
+}
+
 .messagelist tr.flagged span.flag {
     color: #ea3532;
 }
@@ -4400,9 +4387,6 @@ opacity:.3;
 
 .messagelist span.attachment span {
     color: rgba(115, 118, 119, 0.75);
-	position: absolute;
-	top: 29px;
-	left: 9px;
 }
 
 
@@ -4458,8 +4442,6 @@ opacity:.3;
 }
 }
 
-‍
-
 
 .messagelist.sort-size span.date {
     display: none;
@@ -4480,38 +4462,10 @@ html.layout-phone a.refresh {
    display:none;
 }
 
-
-
-.messagelist tr,
-.messagelist tr {
-    position: relative;
-}
-
-.messagelist td.flags,
 .messagelist td.flags {
-    position: absolute;
-    top: 0.4rem;
-    right: 0;
-
-    background-color: transparent;
+	width: 0;
 }
 
-.messagelist td.flags .flag,
-.messagelist td.flags .flag {
-
-}
-
-
-
-html.layout-phone .messagelist td.subject,
-html.touch .messagelist td.subject {
-    padding-right: 0.5em 0;
-}
-
-html.layout-phone .messagelist td.subject .subject,
-html.touch .messagelist td.subject .subject {
-    padding-right: 1.5rem;
-}
 
 .contactlist .contact.readonly td {
     font-style: italic;
diff --git a/templates/mail.html b/templates/mail.html
index f755f6f..568814d 100644
--- a/templates/mail.html
+++ b/templates/mail.html
@@ -19,9 +19,14 @@
 
 <!-- folders list -->
 <div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="aria-label-folderlist">
+
+	<span class="header-title username" style="padding: 0 10px;"></span>
+		
 	<div class="header" style="border:0;">
 	
-	
+
+		
+		
 		<a href="./?_task=mail&_action=compose" class="compose button">
 			<div><i class="sebicon composeicon" style="margin: 1rem;"></i><roundcube:label name="compose" /></div>
 		</a>
diff --git a/ui.min.js b/ui.min.js
index d00f51c..d29973d 100644
--- a/ui.min.js
+++ b/ui.min.js
@@ -622,7 +622,11 @@ if(rcmail.env.action=="preview")
                         }
                     }
 					if(rcmail.task== "mail")
+						{
 						listupdate_go_msgs()
+						if(is_plugin_ident_switch_account())
+							init_plugin_ident_switch_account()
+						}
                 });
             }
 
@@ -4952,7 +4956,12 @@ setTimeout(function() { menuleft.classList.add("menu_marginleft"); }, 0);
 
 
 //move menu
-if(rcmail.env.task == "mail")		$("#menuleft_cont").append($('#folderlist-content'));
+if(rcmail.env.task == "mail")
+	{
+	if(is_plugin_ident_switch_account())
+		$("#menuleft_cont").append($('#plugin-ident_switch-account'));
+	$("#menuleft_cont").append($('#folderlist-content'));	
+	}
 if(rcmail.env.task == "calendar")
 	{
 	$("#menuleft_cont").append($('#layout-sidebar .searchbar'));
@@ -4966,15 +4975,6 @@ if(menuleft_cont.classList.contains("link_added"))
 
 var menuHTML=""
 
-/*
-if(document.querySelector(".menu_bottom").querySelector(".button-calendar")) // If calendar
-	{
-	if(rcmail.env.task == "calendar")
-		menuHTML += "<div class='menuopt'>"+document.querySelector(".menu_bottom").querySelector(".mail").outerHTML+"</div>"
-	else
-		menuHTML += "<div class='menuopt'>"+document.querySelector(".menu_bottom").querySelector(".button-calendar").outerHTML+"</div>"
-	}
-*/
 var lnks = document.querySelector(".menu_bottom").querySelectorAll("a")
 	
 for (i = 0; i < lnks.length; ++i) {
@@ -4982,10 +4982,6 @@ menuHTML += "<div class='menuopt'>"+lnks[i].outerHTML+"</div>"
 }
             
 
-
-
-
-
 menuHTML += document.querySelector("#taskmenu").innerHTML 
 
 document.querySelector("#menuleft_bottom").innerHTML = menuHTML
@@ -5003,7 +4999,16 @@ if(!document.querySelector("#greydiv").classList.contains("fadeoff70create"))
 document.querySelector("#greydiv").classList.remove("fadeoff70create");
 document.querySelector("#menuleft").classList.remove("menu_marginleft");
 
-if(rcmail.env.task == "mail")		setTimeout(function() { $('#folderlist-content').insertBefore($('.menu.menu_bottom')); }, 300);
+if(rcmail.env.task == "mail")
+	{
+		setTimeout(function() {
+			if(is_plugin_ident_switch_account())
+				$('.header-title.username').append($("#plugin-ident_switch-account")) 
+			
+			$('#folderlist-content').insertBefore($('.menu.menu_bottom'));
+			
+			}, 300);
+	}
 if(rcmail.env.task == "calendar")
 	{
 	setTimeout(function() { $('#menuleft .searchbar').insertBefore($('.menu.menu_bottom')); }, 50);
@@ -5146,4 +5151,30 @@ if(e.checked)
 	v=2
 
 $("#compose-priority")[0].value=v
+}
+
+
+
+function is_plugin_ident_switch_account()
+{
+return ($('#plugin-ident_switch-account').length!=0)
+}
+
+function init_plugin_ident_switch_account()
+{
+
+$sw = $('#plugin-ident_switch-account');
+var isOk = plugin_switchIdent_addCbElastic2022($sw)
+if (isOk)
+	$sw.show();
+}
+
+function plugin_switchIdent_addCbElastic2022($sw) {
+    var $taskBar = $('.header-title.username');
+    if ($taskBar.length > 0) {
+        $taskBar.prepend($sw);
+        return true;
+    }
+
+    return false;
 }
\ No newline at end of file