Merge pull request hestiacp#1603 from hestiacp/fix/2021-01-set-correct-webmail-restore

[Bug] Restore preferred webmail client

Author: ScIT-Raphael

bin/v-rebuild-mail-domains

@@ -61,8 +61,12 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     rebuild_mail_domain_conf
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
         if [ ! -z "$IMAP_SYSTEM" ]; then
+            WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
             $BIN/v-delete-sys-webmail $user $domain '' 'yes'
-            $BIN/v-add-sys-webmail $user $domain '' 'yes'
+            $BIN/v-add-sys-webmail $user $domain $WEBMAIL '' 'yes'
+            if [ $? -ne 0 ]; then
+                $BIN/v-add-sys-webmail $user $domain '' '' 'yes'    
+            fi
         fi
     fi
 done