diff --git a/func/rebuild.sh b/func/rebuild.sh
index e0f90a647..6ac4d2879 100644
--- a/func/rebuild.sh
+++ b/func/rebuild.sh
@@ -485,7 +485,7 @@ rebuild_mail_domain_conf() {
 
     dom_aliases=$HOMEDIR/$user/conf/mail/$domain/aliases
     if [ ! -z "$CATCHALL" ]; then
-        echo "*@$domain:$CATCHALL" >> $dom_aliases
+        echo "*@$domain_idn:$CATCHALL" >> $dom_aliases
     fi
 
     # Rebuild domain accounts
@@ -510,10 +510,10 @@ rebuild_mail_domain_conf() {
         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