diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 5dd49ab263..003d706547 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -235,12 +235,22 @@
     width: 95%;
     display: inline-block;
   }
+  #mail-index td .icons et2-image {
+    padding: initial;
+  }
+  #mail-index td .icons et2-image img {
+    padding: initial;
+    height: initial;
+  }
   #mail-index td span[id^='mail-index_'][id$='attachments]'] {
-    float: right;
+    margin-left: auto;
+    order: 1;
+    text-align: initial;
   }
   #mail-index td span[id^='mail-index_'][id$='attachments]'] img {
     width: 16px;
     height: 16px;
+    padding: initial;
   }
   #mail-index td et2-description[id^='mail-index_'][id$='subject]'] {
     overflow: hidden;
diff --git a/mail/templates/mobile/app.less b/mail/templates/mobile/app.less
index dcba32c496..bf1902507e 100644
--- a/mail/templates/mobile/app.less
+++ b/mail/templates/mobile/app.less
@@ -243,11 +243,25 @@
 				width: 95%;
 				display: inline-block;
 			}
+
+		  .icons {
+			et2-image {
+			  padding: initial;
+
+			  img {
+				padding: initial;
+				height: initial;
+			  }
+			}
+		  }
 			span[id^='mail-index_'][id$='attachments]'] {
-				float: right;
+			  margin-left: auto;
+			  order: 1;
+			  text-align: initial;
 				img {
 					width: 16px;
 					height: 16px;
+				  padding: initial;
 				}
 			}
 			et2-description[id^='mail-index_'][id$='subject]'] {
diff --git a/mail/templates/mobile/index.xet b/mail/templates/mobile/index.xet
index b1b0359e45..20224311c5 100644
--- a/mail/templates/mobile/index.xet
+++ b/mail/templates/mobile/index.xet
@@ -20,7 +20,6 @@
 					<et2-vbox>
 						<et2-url-email  id="${row}[address]" class="$row_cont[class]" readonly="true" emailDisplay="preference"></et2-url-email>
 						<et2-hbox>
-							<et2-description  class="status_img $row_cont[class]"></et2-description>
 							<et2-description  id="${row}[subject]" class="$row_cont[class]" noLang="1"></et2-description>
 						</et2-hbox>
 						<et2-description  id="${row}[bodypreview]" class="et2_label bodypreview" noLang="1"></et2-description>
@@ -29,9 +28,10 @@
 						<et2-hbox>
 							<et2-date-time-today  align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"></et2-date-time-today>
 						</et2-hbox>
-						<et2-hbox>
-							<et2-image  src="$row_cont[smime]" height="16px"></et2-image>
-							<html id="${row}[attachments]"/>
+                        <et2-hbox class="icons">
+                            <et2-description class="status_img $row_cont[class]" align="right"></et2-description>
+                            <et2-image src="$row_cont[smime]" height="16px" align="right"></et2-image>
+                            <html id="${row}[attachments]" align="right"/>
 						</et2-hbox>
 					</et2-vbox>
 				</row>
