Index: gui/client/add_mail_acc.php
===================================================================
--- gui/client/add_mail_acc.php	(revision 1230)
+++ gui/client/add_mail_acc.php	(working copy)
@@ -309,9 +309,10 @@
 			}
 		 	$mail_forward = implode(',', $mail_accs);
 		}
+	
+    		$mail_type = implode(',', $mail_type);
+		list($t_, $foo) = split('_', $mail_type, 2);
 
-		$mail_type = implode(',', $mail_type);
-
 		$check_acc_query = <<<SQL_QUERY
 			SELECT
 				COUNT(mail_id) AS cnt
@@ -323,9 +324,11 @@
 				`domain_id` = ?
 				AND
 				`sub_id` = ?
+				AND
+				LEFT (`mail_type`, LOCATE('_', `mail_type`)-1) = ?
 SQL_QUERY;
 
-    	$rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id));
+    	$rs = exec_query($sql, $check_acc_query, array($mail_acc, $domain_id, $sub_id, $t_));
     }
 
     if ($rs->fields['cnt'] > 0) {