@@ -28,7 +28,6 @@ $user = $_SESSION['userinfo'];

 title("E-Mail-Accounts");

-

 if (isset($_GET['action']) && $_GET['action'] == 'save') {

     if (isset($_GET['id'])) {

         check_form_token('email_imap_edit');

@@ -39,7 +39,7 @@ if (! function_exists("user_has_dotcourier_domain")) {

         }

         $uid = (int) $_SESSION['userinfo']['uid'];

         $result = db_query("select 1 from mail.custom_mappings as c left join mail.v_domains as d on (d.id=c.domain) where d.user=:uid or c.uid=:uid UNION ".

-            "SELECT 1 FROM mail.v_domains AS d WHERE d.user=:uid AND d.id != ALL(SELECT domain FROM mail.virtual_mail_domains)", array(":uid" => $uid));

+            "SELECT 1 FROM mail.v_domains AS d WHERE d.user=:uid AND d.mail != 'none' AND d.id != ALL(SELECT domain FROM mail.virtual_mail_domains)", array(":uid" => $uid));

         $ret = ($result->rowCount() > 0);

         if ($ret) {

             DEBUG("User {$uid} has dotcourier-domains");