diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 8daa7e1165..96b53ff394 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2141,6 +2141,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 			{
 				$data["bodypreview"] = $header['bodypreview'];
 			}
+			$data['emailTag'] = $GLOBALS['egw_info']['user']['preferences']['mail']['emailTag'] ?? "onlyname";
 			$rv[] = $data;
 			//error_log(__METHOD__.__LINE__.array2string($data));
 		}
diff --git a/mail/templates/default/index.rows.horizental.xet b/mail/templates/default/index.rows.horizental.xet
index 667b38d585..9be4b40254 100644
--- a/mail/templates/default/index.rows.horizental.xet
+++ b/mail/templates/default/index.rows.horizental.xet
@@ -44,11 +44,11 @@
                         <et2-date-time align="center" id="${row}[date]" readonly="true"></et2-date-time>
                     </et2-hbox>
                     <et2-date-time-today align="center" id="${row}[modified]" readonly="true"></et2-date-time-today>
-                    <et2-url-email id="${row}[address]" readonly="true"></et2-url-email>
-                    <et2-url-email  id="${row}[toaddress]" readonly="true"></et2-url-email>
-                    <et2-url-email  id="${row}[fromaddress]" readonly="true"></et2-url-email>
+                    <et2-url-email id="${row}[address]" readonly="true" fullEmail="$row_cont[emailTag]=fullemail" onlyEmail="$row_cont[emailTag]=onlyemail"></et2-url-email>
+                    <et2-url-email id="${row}[toaddress]" readonly="true" fullEmail="$row_cont[emailTag]=fullemail" onlyEmail="$row_cont[emailTag]=onlyemail"></et2-url-email>
+                    <et2-url-email id="${row}[fromaddress]" readonly="true" fullEmail="$row_cont[emailTag]=fullemail" onlyEmail="$row_cont[emailTag]=onlyemail"></et2-url-email>
                     <vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/>
-                    <et2-image  src="$row_cont[smime]" ></et2-image>
+                    <et2-image src="$row_cont[smime]"></et2-image>
                 </row>
             </rows>
         </grid>