- Fix email_dns_check setting not used for identities/contacts (#1487740)

3 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 37456222d..2a7cdfbf6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix email_dns_check setting not used for identities/contacts (#1487740)
 - Fix ICANN example addresses doesn't validate (#1487742)
 - Security: protect login form submission from CSRF
 - Security: prevent from relaying malicious requests through modcss.inc
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 934db4c73..3d55d953c 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -143,7 +143,7 @@ if (empty($a_record['name'])/* || empty($a_record['email'])*/) {
 foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
   if (strlen($email)) {
     $_email = rcube_idn_to_ascii($email);
-    if (!check_email($_email, false)) {
+    if (!check_email($_email)) {
       $OUTPUT->show_message('emailformaterror', 'warning', array('email' => $email));
       rcmail_overwrite_action($return_action);
       return;
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index f0d25f35a..4fb6a2a9f 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -60,7 +60,7 @@ if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3)
 foreach (array('email', 'reply-to', 'bcc') as $item) {
   if ($email = $save_data[$item]) {
     $ascii_email = rcube_idn_to_ascii($email);
-    if (!check_email($ascii_email, false)) {
+    if (!check_email($ascii_email)) {
       // show error message
       $OUTPUT->show_message('emailformaterror', 'error', array('email' => $email), false);
       rcmail_overwrite_action('edit-identity');