diff --git a/infolog/templates/mobile/edit.xet b/infolog/templates/mobile/edit.xet
index bd80f410bd..235525836e 100644
--- a/infolog/templates/mobile/edit.xet
+++ b/infolog/templates/mobile/edit.xet
@@ -65,7 +65,7 @@
 			<rows>
 				<row>
 					<et2-description  value="CC"></et2-description>
-					<et2-select-email  id="info_cc" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="email"></et2-select-email>
+					<et2-email  id="info_cc" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="email"></et2-email>
 				</row>
 				<row>
 					<et2-description  value="Responsible" for="info_responsible"></et2-description>
diff --git a/infolog/templates/mobile/view.xet b/infolog/templates/mobile/view.xet
index 88c3908e91..a559c69ec3 100644
--- a/infolog/templates/mobile/view.xet
+++ b/infolog/templates/mobile/view.xet
@@ -65,7 +65,7 @@
 			<rows>
 				<row>
 					<et2-description  value="CC"></et2-description>
-					<et2-select-email  id="info_cc" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="email"></et2-select-email>
+					<et2-email  id="info_cc" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="email"></et2-email>
 				</row>
 				<row>
 					<et2-description  value="Responsible" for="info_responsible"></et2-description>
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 68a1d5f4d8..3a6b149a4e 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -25,7 +25,7 @@
                             </columns>
                             <rows>
                                 <row>
-                                    <et2-select-email  id="${row}" readonly="true"></et2-select-email>
+                                    <et2-email  id="${row}" readonly="true"></et2-email>
                                 </row>
                             </rows>
                         </grid>
@@ -38,22 +38,22 @@
                             </columns>
                             <rows>
                                 <row>
-                                    <et2-select-email  id="${row}" readonly="true"></et2-select-email>
+                                    <et2-email  id="${row}" readonly="true"></et2-email>
                                 </row>
                             </rows>
                         </grid>
                     </et2-hbox>
                     <et2-hbox  disabled="!@to">
                         <et2-description  value="To" class="firstColumnTitle"></et2-description>
-                        <et2-select-email  id="to" readonly="true" multiple="true" fullEmail="true"/>
+                        <et2-email  id="to" readonly="true" multiple="true" fullEmail="true"/>
                     </et2-hbox>
                     <et2-hbox  disabled="!@cc">
                         <et2-description  value="Cc" class="firstColumnTitle"></et2-description>
-                        <et2-select-email  id="cc" readonly="true" multiple="true" fullEmail="true"/>
+                        <et2-email  id="cc" readonly="true" multiple="true" fullEmail="true"/>
                     </et2-hbox>
                     <et2-hbox  disabled="!@bcc">
                         <et2-description  value="Bcc" class="firstColumnTitle"></et2-description>
-                        <et2-select-email  id="bcc" readonly="true" multiple="true" fullEmail="true"/>
+                        <et2-email  id="bcc" readonly="true" multiple="true" fullEmail="true"/>
                     </et2-hbox>
                 </et2-vbox>
                 <grid id="mail_displayattachments" class="attachments ">
@@ -78,24 +78,24 @@
                         <et2-vbox  class="addresses">
                             <et2-hbox  disabled="!@from">
                                 <et2-description  value="From" class="firstColumnTitle"></et2-description>
-                                <et2-select-email  id="from" readonly="true" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+                                <et2-email  id="from" readonly="true" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
                                 <et2-date-time-today  align="right" id="mail_displaydate" readonly="true"></et2-date-time-today>
                             </et2-hbox>
                             <et2-hbox  disabled="!@sender">
                                 <et2-description  value="Sender" class="firstColumnTitle"></et2-description>
-                                <et2-select-email  id="sender" readonly="true" rows="1" maxOptionsVisible="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+                                <et2-email  id="sender" readonly="true" rows="1" maxOptionsVisible="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
                             </et2-hbox>
                             <et2-hbox  disabled="!@to">
                                 <et2-description  value="To" class="firstColumnTitle"></et2-description>
-                                <et2-select-email  id="to" readonly="true" rows="1" maxOptionsVisible="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+                                <et2-email  id="to" readonly="true" rows="1" maxOptionsVisible="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
                             </et2-hbox>
                             <et2-hbox  disabled="!@cc">
                                 <et2-description  value="Cc" class="firstColumnTitle"></et2-description>
-                                <et2-select-email  id="cc" rows="1" maxOptionsVisible="1" readonly="true" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+                                <et2-email  id="cc" rows="1" maxOptionsVisible="1" readonly="true" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
                             </et2-hbox>
                             <et2-hbox  disabled="!@bcc">
                                 <et2-description  value="Bcc" class="firstColumnTitle"></et2-description>
-                                <et2-select-email  id="bcc" rows="1" maxOptionsVisible="1" readonly="true" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+                                <et2-email  id="bcc" rows="1" maxOptionsVisible="1" readonly="true" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
                             </et2-hbox>
                             <et2-hbox width="100%" disabled="!@mail_displayattachments">
                                 <et2-description value="Attachments" class="firstColumnTitle"></et2-description>
diff --git a/mail/templates/default/sieve.emailNotification.xet b/mail/templates/default/sieve.emailNotification.xet
index 0678b88209..308df64242 100644
--- a/mail/templates/default/sieve.emailNotification.xet
+++ b/mail/templates/default/sieve.emailNotification.xet
@@ -22,7 +22,7 @@
 				</row>
 				<row>
 					<et2-description  value="External email address:"></et2-description>
-					<et2-select-email  id="externalEmail" required="true" width="40%" allowFreeEntries="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+					<et2-email  id="externalEmail" required="true" width="40%" allowFreeEntries="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-email>
 				</row>
 				<row>
 					<et2-description  value="Display mail subject in notification:	"></et2-description>
diff --git a/mail/templates/mobile/view.xet b/mail/templates/mobile/view.xet
index a2d4247293..9fec876556 100644
--- a/mail/templates/mobile/view.xet
+++ b/mail/templates/mobile/view.xet
@@ -21,22 +21,22 @@
 				<et2-vbox>
 					<et2-hbox>
 						<et2-details  class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
-							<et2-select-email  slot="summary" id="fromaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"/>
+							<et2-email  slot="summary" id="fromaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
 							<et2-hbox>
 								<et2-description  value="From" class="firstColumnTitle"></et2-description>
-								<et2-select-email  id="additionalfromaddress"  rows="1" multiple="true" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+								<et2-email  id="additionalfromaddress"  rows="1" multiple="true" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
 							</et2-hbox>
 							<et2-hbox  disabled="!@toaddress" width="100%">
 								<et2-description  value="To" class="firstColumnTitle"></et2-description>
-								<et2-select-email  id="additionaltoaddress" rows="1" multiple="true" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+								<et2-email  id="additionaltoaddress" rows="1" multiple="true" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
 							</et2-hbox>
 							<et2-hbox  disabled="!@ccaddress" width="100%">
 								<et2-description  value="Cc" class="firstColumnTitle"></et2-description>
-								<et2-select-email  id="ccaddress" readonly="true" rows="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+								<et2-email  id="ccaddress" readonly="true" rows="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
 							</et2-hbox>
 							<et2-hbox  disabled="!@bccaddress" width="100%">
 								<et2-description  value="BCc" class="firstColumnTitle"></et2-description>
-								<et2-select-email  id="bccaddress" readonly="true" rows="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
+								<et2-email  id="bccaddress" readonly="true" rows="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-email>
 							</et2-hbox>
 						</et2-details>
 						<et2-date-time-today  align="right" id="date" readonly="true"></et2-date-time-today>