diff --git a/mail.php b/mail.php
index f2db1af35..317acc898 100755
--- a/mail.php
+++ b/mail.php
@@ -118,14 +118,14 @@ $idx = 0;
 foreach ($emails as $email) {
     echo '
             <div class="col-md-12">
-                {[ "type": "email", "name": "destinatari['.$idx++.']", "value": "'.$email.'", "icon-before": "choice|email|'.$template['type'].'", "extra": "onkeyup=\'aggiungiDestinatario();\'", "class": "destinatari", "required": 0 ]}
+                {[ "type": "text", "name": "destinatari['.$idx++.']", "value": "'.$email.'", "icon-before": "choice|email|'.$template['type'].'", "extra": "onkeyup=\'aggiungiDestinatario();\'", "class": "destinatari email-mask", "required": 0 ]}
             </div>';
 }
 
 if (empty($emails)) {
     echo '
             <div class="col-md-12">
-                {[ "type": "email", "name": "destinatari['.$idx++.']", "value": "", "icon-before": "choice|email|'.$template['type'].'", "extra": "onkeyup=\'aggiungiDestinatario();\'", "class": "destinatari", "required": 0 ]}
+                {[ "type": "text", "name": "destinatari['.$idx++.']", "value": "", "icon-before": "choice|email|'.$template['type'].'", "extra": "onkeyup=\'aggiungiDestinatario();\'", "class": "destinatari email-mask", "required": 0 ]}
             </div>';
 }
 echo '
@@ -197,7 +197,7 @@ echo '
 echo '
 <div class="hidden" id="template-destinatario">
     <div class="col-md-12">
-        {[ "type": "email", "name": "destinatari[-id-]", "icon-before": "choice|email|'.$template['type'].'", "extra": "onkeyup=\'aggiungiDestinatario();\'", "class": "destinatari" ]}
+        {[ "type": "text", "name": "destinatari[-id-]", "icon-before": "choice|email|'.$template['type'].'", "extra": "onkeyup=\'aggiungiDestinatario();\'", "class": "destinatari email-mask" ]}
     </div>
 </div>';
 
diff --git a/modules/anagrafiche/add.php b/modules/anagrafiche/add.php
index 3f4d65079..5bf0a034a 100755
--- a/modules/anagrafiche/add.php
+++ b/modules/anagrafiche/add.php
@@ -119,11 +119,11 @@ echo '
 			<div class="row">
 
 				<div class="col-md-4">
-					{[ "type": "text", "label": "'.tr('Email').'", "name": "email", "class": "email-mask", "placeholder":"casella@dominio.ext", "icon-before": "<i class=\"fa fa-envelope\"></i>", "validation": "email" ]}
+					{[ "type": "email", "label": "'.tr('Email').'", "name": "email", "placeholder":"casella@dominio.ext", "validation": "email" ]}
 				</div>
 
 				<div class="col-md-4">
-					{[ "type": "text", "label": "'.tr('PEC').'", "name": "pec", "class": "email-mask", "placeholder":"pec@dominio.ext", "icon-before": "<i class=\'fa fa-envelope-o\'></i>" ]}
+					{[ "type": "email", "label": "'.tr('PEC').'", "name": "pec", "placeholder":"pec@dominio.ext" ]}
 				</div>';
 
 $help_codice_destinatario = tr("Per impostare il codice specificare prima '<b>Tipologia</b>' e '<b>Nazione</b>' dell'anagrafica").':<br><br><ul><li>'.tr('Azienda (B2B) - Codice Destinatario, 7 caratteri').'</li><li>'.tr('Ente pubblico (B2G/PA) - Codice Univoco Ufficio (www.indicepa.gov.it), 6 caratteri').'</li><li>'.tr('Privato (B2C) - viene utilizzato il Codice Fiscale').'</li></ul>Se non si conosce il codice destinatario lasciare vuoto il campo. Verrà applicato in automatico quello previsto di default dal sistema (\'0000000\', \'999999\', \'XXXXXXX\').';
diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php
index d71e2b037..285995e1c 100755
--- a/modules/anagrafiche/edit.php
+++ b/modules/anagrafiche/edit.php
@@ -162,7 +162,7 @@ if (in_array($id_azienda, $tipi_anagrafica)) {
                     </div>
 
                     <div class="col-md-4">
-                        {[ "type": "text", "label": "<?php echo tr('PEC'); ?>", "name": "pec", "class": "email-mask", "placeholder":"pec@dominio.ext", "value": "$pec$", "icon-before": "<i class='fa fa-envelope-o'></i>", "validation": "email" ]}
+                        {[ "type": "email", "label": "<?php echo tr('PEC'); ?>", "name": "pec", "placeholder":"pec@dominio.ext", "value": "$pec$", "validation": "email" ]}
                     </div>
 
                     <div class="col-md-4">
@@ -218,7 +218,7 @@ if (in_array($id_azienda, $tipi_anagrafica)) {
                             </div>
 
                             <div class="col-md-4">
-                                {[ "type": "text", "label": "<?php echo tr('Email'); ?>", "name": "email", "class": "email-mask", "placeholder": "casella@dominio.ext", "value": "$email$", "icon-before": "<i class='fa fa-envelope'></i>", "validation": "email" ]}
+                                {[ "type": "email", "label": "<?php echo tr('Email'); ?>", "name": "email", "placeholder": "casella@dominio.ext", "value": "$email$", "validation": "email" ]}
                             </div>
                         </div>
 
diff --git a/modules/emails/edit.php b/modules/emails/edit.php
index 182617efc..34893b668 100755
--- a/modules/emails/edit.php
+++ b/modules/emails/edit.php
@@ -96,7 +96,7 @@ if (!$record['predefined']) {
                 </div>
 
                 <div class="col-md-6">
-                    {[ "type": "email", "label": "<?php echo tr('Destinatario fisso'); ?>", "name": "reply_to", "value": "$reply_to$", "help": "<?php echo 'Rispondi a questo indirizzo e-mail.'; ?>" ]}
+                    {[ "type": "text", "class": "email-mask", "label": "<?php echo tr('Destinatario fisso'); ?>", "name": "reply_to", "value": "$reply_to$", "help": "<?php echo 'Rispondi a questo indirizzo e-mail.'; ?>" ]}
                 </div>
             </div>
 
diff --git a/modules/newsletter/ajax/table.php b/modules/newsletter/ajax/table.php
index a4407a822..0aeb2455d 100644
--- a/modules/newsletter/ajax/table.php
+++ b/modules/newsletter/ajax/table.php
@@ -80,11 +80,10 @@ foreach ($destinatari_filtrati as $destinatario) {
         '<div class="text-center">'.
         (!empty($origine->email) ?
             input([
-                'type' => 'text',
+                'type' => 'email',
                 'name' => 'email',
                 'id' => 'email_'.random_int(0, 99999),
                 'readonly' => '1',
-                'class' => 'email-mask',
                 'value' => $origine->email,
                 'validation' => 'email|'.$id_modulo_anagrafiche.'|'.$destinatario->record_id,
             ]) :
diff --git a/modules/smtp/add.php b/modules/smtp/add.php
index 2957ac65d..1df0c7b58 100755
--- a/modules/smtp/add.php
+++ b/modules/smtp/add.php
@@ -35,7 +35,7 @@ include_once __DIR__.'/../../core.php';
 		</div>
 
 		<div class="col-md-6">
-			{[ "type": "email", "label": "<?php echo tr('Email mittente'); ?>", "name": "from_address", "required": 1 ]}
+			{[ "type": "text", "class": "email-mask", "label": "<?php echo tr('Email mittente'); ?>", "name": "from_address", "required": 1 ]}
 		</div>
     </div>
 
diff --git a/modules/smtp/edit.php b/modules/smtp/edit.php
index 3d4d73c2b..f24d7a0f7 100755
--- a/modules/smtp/edit.php
+++ b/modules/smtp/edit.php
@@ -53,7 +53,7 @@ echo '
                 </div>
 
                 <div class="col-md-3">
-                    {[ "type": "email", "label": "'.tr('Email mittente').'", "name": "from_address", "value": "$from_address$", "required": 1 ]}
+                    {[ "type": "text", "class": "email-mask", "label": "'.tr('Email mittente').'", "name": "from_address", "value": "$from_address$", "required": 1 ]}
                 </div>
 
 				<div class="col-md-3">
diff --git a/modules/utenti/components/base.php b/modules/utenti/components/base.php
index 05f501b76..87a7a1328 100755
--- a/modules/utenti/components/base.php
+++ b/modules/utenti/components/base.php
@@ -46,7 +46,7 @@ echo '
 
     <div class="row">
 		<div class="col-md-12">
-		{[ "type": "email", "label": "'.tr('Email').'", "name": "email", "required": 0, "value": "'.$utente['email'].'", "validation": "email" ]}
+		{[ "type": "text", "class": "email-mask", "label": "'.tr('Email').'", "name": "email", "required": 0, "value": "'.$utente['email'].'", "validation": "email" ]}
 		</div>
     </div>';
 
diff --git a/plugins/referenti/add.php b/plugins/referenti/add.php
index 1ae97ed80..3e7d31fe2 100755
--- a/plugins/referenti/add.php
+++ b/plugins/referenti/add.php
@@ -45,7 +45,7 @@ echo '
 		</div>
 
 		<div class="col-md-6">
-			{[ "type": "text", "label": "'.tr('Indirizzo email').'", "name": "email", "class": "email-mask", "validation": "email"]}
+			{[ "type": "email", "label": "'.tr('Indirizzo email').'", "name": "email", "validation": "email"]}
 		</div>
 	</div>
 
diff --git a/plugins/referenti/edit.php b/plugins/referenti/edit.php
index 4de825583..0e413e52d 100755
--- a/plugins/referenti/edit.php
+++ b/plugins/referenti/edit.php
@@ -44,7 +44,7 @@ echo '
         </div>
 
         <div class="col-md-6">
-            {[ "type": "text", "label": "'.tr('Indirizzo email').'", "name": "email", "class": "email-mask", "value" : "$email$", "validation": "email" ]}
+            {[ "type": "email", "label": "'.tr('Indirizzo email').'", "name": "email", "value" : "$email$", "validation": "email" ]}
         </div>
     </div>
 
diff --git a/plugins/sedi/add.php b/plugins/sedi/add.php
index e675cac33..d6820aee0 100755
--- a/plugins/sedi/add.php
+++ b/plugins/sedi/add.php
@@ -78,7 +78,7 @@ echo '
 		</div>
 
 		<div class="col-md-3">
-			{[ "type": "text", "label": "'.tr('Indirizzo email').'", "name": "email", "class": "email-mask", "validation": "email" ]}
+			{[ "type": "email", "label": "'.tr('Indirizzo email').'", "name": "email", "validation": "email" ]}
 		</div>
 		<div class="col-md-3">
 			{[ "type": "checkbox", "label": "'.tr('Opt-out per newsletter').'", "name": "disable_newsletter_add", "id": "disable_newsletter_m",  "value": "0", "help": "'.tr("Blocco per l'invio delle email.").'" ]}
diff --git a/plugins/sedi/edit.php b/plugins/sedi/edit.php
index 49a155bcc..015db980a 100755
--- a/plugins/sedi/edit.php
+++ b/plugins/sedi/edit.php
@@ -78,7 +78,7 @@ echo '
 			{[ "type": "telefono", "label": "'.tr('Cellulare').'", "name": "cellulare", "value": "$cellulare$" ]}
 		</div>
 		<div class="col-md-3">
-			{[ "type": "text", "label": "'.tr('Indirizzo email').'", "name": "email", "value": "$email$", "class": "email-mask", "validation": "email" ]}
+			{[ "type": "email", "label": "'.tr('Indirizzo email').'", "name": "email", "value": "$email$", "validation": "email" ]}
 		</div>
         <div class="col-md-3">
             {[ "type": "checkbox", "label": "'.tr('Opt-out per newsletter').'", "name": "disable_newsletter", "id": "disable_newsletter_m", "value": "'.empty($record['enable_newsletter']).'", "help": "'.tr("Blocco per l'invio delle email.").'" ]}
diff --git a/reset.php b/reset.php
index 91b244603..5c2c937b8 100755
--- a/reset.php
+++ b/reset.php
@@ -134,7 +134,7 @@ if (empty($token)) {
 
             {[ "type": "text", "label": "'.tr('Username').'", "placeholder": "'.tr('Username').'", "name": "username", "icon-before": "<i class=\"fa fa-user\"></i>", "required": 1 ]}
 
-            {[ "type": "email", "label": "'.tr('Email').'", "placeholder": "'.tr('Email').'", "name": "email", "icon-before": "<i class=\"fa fa-envelope\"></i>", "required": 1 ]}';
+            {[ "type": "text", "class": "email-mask", "label": "'.tr('Email').'", "placeholder": "'.tr('Email').'", "name": "email", "icon-before": "<i class=\"fa fa-envelope\"></i>", "required": 1 ]}';
 } else {
     echo '
             <input type="hidden" name="op" value="update">
diff --git a/src/HTMLBuilder/Handler/DefaultHandler.php b/src/HTMLBuilder/Handler/DefaultHandler.php
index 480e43183..dbfbb1cde 100755
--- a/src/HTMLBuilder/Handler/DefaultHandler.php
+++ b/src/HTMLBuilder/Handler/DefaultHandler.php
@@ -261,6 +261,8 @@ class DefaultHandler implements HandlerInterface
 
         $values['type'] = 'text';
 
+        $values['icon-before'] = $values['value'] ? '<a href="mailto:'.$values['value'].'" target="_blank"><i class="fa fa-envelope"></i></a>' : '<i class="fa fa-envelope"></i>';
+
         // Delega al metodo "text", per la generazione del codice HTML
         return $this->text($values, $extras);
     }