diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index 839ff35758..029706bade 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -259,12 +259,12 @@
 				</row>
 				<row>
 					<et2-description for="mailAlternateAddress" value="Alternate email address"></et2-description>
-					<et2-select-email id="mailAlternateAddress" allowFreeEntries="true" multiple="true" autocompleteUrl="" onlyEmail="true"></et2-select-email>
+					<et2-email id="mailAlternateAddress" multiple="true" searchUrl="" onlyEmail="true"></et2-email>
 					<et2-description></et2-description>
 				</row>
 				<row disabled="@no_forward_available">
 					<et2-description for="mailForwardingAddress" value="Forward email's to"></et2-description>
-					<et2-select-email id="mailForwardingAddress" allowFreeEntries="true" multiple="true" autocompleteUrl="" onlyEmail="true"></et2-select-email>
+					<et2-email id="mailForwardingAddress" multiple="true" searchUrl="" onlyEmail="true"></et2-email>
 					<et2-vbox>
 						<et2-checkbox label="Forward only" id="deliveryMode" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');" selectedValue="forwardOnly"></et2-checkbox>
 						<et2-checkbox label="Allow users to change forwards" id="acc_user_forward"></et2-checkbox>
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 412748021a..6a3d0c3264 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -85,7 +85,7 @@
                 </row>
                 <row valign="top">
                     <et2-vbox>
-                        <et2-select-email  id="info_cc" class="et2-label-fixed" label="CC" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+                        <et2-email  id="info_cc" class="et2-label-fixed" label="CC" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-email>
 
                         <et2-select-account  label="Responsible" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" rows="6" multiple="1" class="et2-label-fixed" onchange="app.infolog.onchangeResponsible" placeholder="Select users or groups" noLang="1" accountType="both"></et2-select-account>
                     </et2-vbox>
@@ -225,4 +225,4 @@
 			</rows>
 		</grid>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 9f88b84216..eb8dd3411d 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -46,8 +46,8 @@
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryReplyto">
 						<et2-description  value="Reply to"></et2-description>
-						<et2-select-email  id="replyto" width="100%" onclick="app.mail.address_click" multiple="true"
-							searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" allowPlaceholder="true"></et2-select-email>
+						<et2-email  id="replyto" width="100%" onclick="app.mail.address_click" multiple="true"
+							searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" allowPlaceholder="true"></et2-email>
 						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryFolder">
diff --git a/mail/templates/default/predefinedAddressesDialog.xet b/mail/templates/default/predefinedAddressesDialog.xet
index 8130346770..d968da5c89 100644
--- a/mail/templates/default/predefinedAddressesDialog.xet
+++ b/mail/templates/default/predefinedAddressesDialog.xet
@@ -14,7 +14,7 @@
 					</row>
 					<row>
 						<et2-description  value="Reply to"></et2-description>
-						<et2-select-email  id="replyto" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+						<et2-email  id="replyto" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-email>
 					</row>
 					<row>
 						<et2-description  value="Folder"></et2-description>
@@ -22,11 +22,11 @@
 					</row>
 					<row>
 						<et2-description  value="Cc"></et2-description>
-						<et2-select-email  id="cc" allowFreeEntries="true" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
+						<et2-email  id="cc" allowFreeEntries="true" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-email>
 					</row>
 					<row>
 						<et2-description  value="Bcc"></et2-description>
-						<et2-select-email  id="bcc" allowFreeEntries="true" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-select-email>
+						<et2-email  id="bcc" allowFreeEntries="true" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" includeLists="true"></et2-email>
 					</row>
 				</rows>
 			</grid>
diff --git a/mail/templates/default/sieve.edit.xet b/mail/templates/default/sieve.edit.xet
index 7004e19af3..1c481a77f2 100644
--- a/mail/templates/default/sieve.edit.xet
+++ b/mail/templates/default/sieve.edit.xet
@@ -78,7 +78,7 @@
 				<row disabled="@no_forward">
 					<radio label="Forward to address (*):" id="action" set_value="address" />
 					<et2-hbox>
-						<et2-select-email  allowFreeEntries="true" id="action_address_text" onfocus="app.mail.sieve_focus_radioBtn" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+						<et2-email  allowFreeEntries="true" id="action_address_text" onfocus="app.mail.sieve_focus_radioBtn" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-email>
 					</et2-hbox>
 				</row>
 				<row>
diff --git a/mail/templates/default/sieve.vacation.xet b/mail/templates/default/sieve.vacation.xet
index 46e6d05a58..ed7341be50 100644
--- a/mail/templates/default/sieve.vacation.xet
+++ b/mail/templates/default/sieve.vacation.xet
@@ -26,12 +26,12 @@
 				</row>
 				<row>
 					<et2-description  value="Respond to mail sent to:"></et2-description>
-					<et2-select-email  rows="3" id="addresses" class="et2_required" allowFreeEntries="true" span="2" multiple="1" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="all my email addresses" required="true"></et2-select-email>
+					<et2-email  id="addresses" class="et2_required" allowFreeEntries="true" span="2" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="all my email addresses" required="true"></et2-email>
 					<et2-button  class="$cont[hideIfSieveDisabled]" label="Add all my aliases" id="AllAddresses" onclick="app.mail.sieve_vac_all_aliases()"></et2-button>
 				</row>
 				<row>
 					<et2-description  value="Forward messages to:"></et2-description>
-					<et2-select-email  id="forwards" allowFreeEntries="true" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="do not forward"></et2-select-email>
+					<et2-email  id="forwards" allowFreeEntries="true" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="do not forward"></et2-email>
 				</row>
 				<row>
 					<et2-description value="Vacation notice"></et2-description>
diff --git a/mail/templates/mobile/compose.xet b/mail/templates/mobile/compose.xet
index 7a50a0a2b9..ea0fc47508 100644
--- a/mail/templates/mobile/compose.xet
+++ b/mail/templates/mobile/compose.xet
@@ -49,7 +49,7 @@
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryReplyto">
 						<et2-description  value="Reply to"></et2-description>
-						<et2-select-email  id="replyto" width="100%" onclick="app.mail.address_click" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-select-email>
+						<et2-email  id="replyto" width="100%" onclick="app.mail.address_click" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email"></et2-email>
 						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryFolder">
diff --git a/mail/templates/mobile/sieve.vacation.xet b/mail/templates/mobile/sieve.vacation.xet
index 4e2a127136..9c5546f062 100644
--- a/mail/templates/mobile/sieve.vacation.xet
+++ b/mail/templates/mobile/sieve.vacation.xet
@@ -35,7 +35,7 @@
 				</row>
 				<row>
 					<et2-vbox>
-						<et2-select-email  id="addresses" class="et2_required" allowFreeEntries="true" span="2" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="all my email addresses" required="true"></et2-select-email>
+						<et2-email  id="addresses" class="et2_required" allowFreeEntries="true" span="2" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="all my email addresses" required="true"></et2-email>
 						<et2-button  class="$cont[hideIfSieveDisabled]" label="Add all my aliases" id="AllAddresses" onclick="app.mail.sieve_vac_all_aliases()"></et2-button>
 					</et2-vbox>
 				</row>
@@ -43,7 +43,7 @@
 					<et2-description  value="Forward messages to:"></et2-description>
 				</row>
 				<row>
-					<et2-select-email  id="forwards" allowFreeEntries="true" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="do not forward"></et2-select-email>
+					<et2-email  id="forwards" allowFreeEntries="true" width="100%" multiple="true" searchUrl="EGroupware\Api\Etemplate\Widget\Taglist::ajax_email" placeholder="do not forward"></et2-email>
 				</row>
 				<row>
 					<et2-hbox>