diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias
index 9447bfb9..d1d12a4c 100755
--- a/bin/v-add-mail-account-alias
+++ b/bin/v-add-mail-account-alias
@@ -45,7 +45,7 @@ is_mail_new "$malias"
 
 # Adding exim alias
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    str="$malias@$domain:$account@$domain"
+    str="$malias@$domain_idn:$account@$domain_idn"
     echo "$str" >> $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward
index ba1f3de1..5b2720a1 100755
--- a/bin/v-add-mail-account-forward
+++ b/bin/v-add-mail-account-forward
@@ -57,8 +57,8 @@ fi
 
 # Adding forward to exim
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
-    echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    echo "$account@$domain_idn:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
 
diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall
index e6f2f1ae..c49bacc9 100755
--- a/bin/v-add-mail-domain-catchall
+++ b/bin/v-add-mail-domain-catchall
@@ -42,8 +42,8 @@ is_object_value_empty 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 
 # Adding catchall alias
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-    echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    echo "*@$domain_idn:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
 
diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall
index fa3c2a1c..7428d552 100755
--- a/bin/v-change-mail-domain-catchall
+++ b/bin/v-change-mail-domain-catchall
@@ -41,8 +41,8 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 
 # Change cathcall alias
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
-    echo "*@$domain:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    echo "*@$domain_idn:$email" >> $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
 
diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account
index e94cae4d..7f11911d 100755
--- a/bin/v-delete-mail-account
+++ b/bin/v-delete-mail-account
@@ -44,11 +44,11 @@ is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
     aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS')
     for al in ${aliases//,/ }; do
-        sed -i "/^$al@$domain:$account/d" \
+        sed -i "/^$al@$domain_idn:$account/d" \
             $HOMEDIR/$user/conf/mail/$domain/aliases
     done
 
-    sed -i "/^$account@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/^$account@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
     sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
     rm -rf $HOMEDIR/$user/mail/$domain/$account
 fi
diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias
index de7310d7..c8d1da44 100755
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@@ -49,7 +49,7 @@ fi
 #----------------------------------------------------------#
 
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    sed -i "/^$malias@$domain:$account/d" \
+    sed -i "/^$malias@$domain_idn:$account/d" \
         $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward
index 4eb31e6c..4562789c 100755
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@@ -57,8 +57,8 @@ fwd=$(echo "$fwd" |\
 
 # Deleting exim forward
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    sed -i "/^$account@$domain:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
-    echo "$account@$domain:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    echo "$account@$domain_idn:$fwd" >> $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
 
diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall
index 42a6ce66..3fa0639f 100755
--- a/bin/v-delete-mail-domain-catchall
+++ b/bin/v-delete-mail-domain-catchall
@@ -41,7 +41,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 
 # Delete cathcall alias
 if [[ "$MAIL_SYSTEM" =~ exim ]]; then
-    sed -i "/*@$domain:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
+    sed -i "/*@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases
 fi
 
 
diff --git a/func/rebuild.sh b/func/rebuild.sh
index 48032081..cc13523d 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -489,7 +489,7 @@ rebuild_mail_domain_conf() {
         # Adding catchall email
         dom_aliases=$HOMEDIR/$user/conf/mail/$domain/aliases
         if [ ! -z "$CATCHALL" ]; then
-            echo "*@$domain:$CATCHALL" >> $dom_aliases
+            echo "*@$domain_idn:$CATCHALL" >> $dom_aliases
         fi
     fi
 
@@ -515,10 +515,10 @@ rebuild_mail_domain_conf() {
             str="$account:$MD5:$user:mail::$HOMEDIR/$user:$QUOTA"
             echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd
             for malias in ${ALIAS//,/ }; do
-                echo "$malias@$domain:$account@$domain" >> $dom_aliases
+                echo "$malias@$domain_idn:$account@$domain_idn" >> $dom_aliases
             done
             if [ ! -z "$FWD" ]; then
-                echo "$account@$domain:$FWD" >> $dom_aliases
+                echo "$account@$domain_idn:$FWD" >> $dom_aliases
             fi
             if [ "$FWD_ONLY" = 'yes' ]; then
                 echo "$account" >> $HOMEDIR/$user/conf/mail/$domain/fwd_only