diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 1a430d561b137f9b874c80087759f247b27a1c7e..7946cf56be21107e3526be8e8bf62bd700ad8f74 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -448,6 +448,8 @@ CREATE TABLE `mail_user` (
   `custom_mailfilter` text,
   `postfix` enum('y','n') NOT NULL,
   `access` enum('y','n') NOT NULL,
+  `disableimap` enum('0','1') NOT NULL default '0',
+  `disablepop3` enum('0','1') NOT NULL default '0',
   PRIMARY KEY  (`mailuser_id`),
   KEY `server_id` (`server_id`,`email`),
   KEY `email_access` (`email`,`access`)
diff --git a/install/tpl/authmysqlrc.master b/install/tpl/authmysqlrc.master
index 9e50a4a219c5d84fe9c8ae9027011f138e9d68bf..38b02241ae3e85e9f52b2f046e9e89ebb57c7ac5 100644
--- a/install/tpl/authmysqlrc.master
+++ b/install/tpl/authmysqlrc.master
@@ -14,4 +14,5 @@ MYSQL_MAILDIR_FIELD maildir
 #MYSQL_NAME_FIELD
 #MYSQL_QUOTA_FIELD quota
 MYSQL_QUOTA_FIELD concat(quota,'S')
-MYSQL_WHERE_CLAUSE      access='y'
\ No newline at end of file
+#MYSQL_WHERE_CLAUSE      access='y'
+MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3)
\ No newline at end of file
diff --git a/interface/web/admin/form/firewall.tform.php b/interface/web/admin/form/firewall.tform.php
index 2f4ace81254f22388bbdee144543379fabe1bbf7..d9c4ed667c6fba335e3e6cdf4417d15d2ebf5c7d 100644
--- a/interface/web/admin/form/firewall.tform.php
+++ b/interface/web/admin/form/firewall.tform.php
@@ -79,7 +79,7 @@ $form["tabs"]['firewall'] = array (
 														'regex' => '/^[\s0-9\,]{0,255}$/',
 														'errmsg'=> 'tcp_ports_error_regex'),
 									),
-			'default'	=> '21,22,25,53,80,110,443,8080,10000',
+			'default'	=> '20,21,22,25,53,80,110,443,8080,10000',
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 454f93c06f894770aa54fcdf11ea1518e08e7fd5..be3f6758d1e25c6d5896148b9b5baf3fef8a5e77 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -137,12 +137,26 @@ $form["tabs"]['mailuser'] = array (
 			'default'	=> 'y',
 			'value'		=> array(1 => 'y',0 => 'n')
 		),
+		/*
 		'access' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'CHECKBOX',
 			'default'	=> 'y',
 			'value'		=> array(1 => 'y',0 => 'n')
 		),
+		*/
+		'disableimap' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> array(1 => '1',0 => '0')
+		),
+		'disablepop3' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> 'y',
+			'value'		=> array(1 => '1',0 => '0')
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 98ee1d9067cf540335c2a5024613fc444e290b27..d85ed09ecbd17d37ece6936f185c9f23af243c9a 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -24,4 +24,6 @@ $wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is rea
 $wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is';
 $wb["welcome_mail_subject"] = 'Welcome to your new email account.';
 $wb["welcome_mail_message"] = "Welcome to your new email account.\n\nYour webmaster.";
+$wb["disableimap_txt"] = 'Disable IMAP';
+$wb["disablepop3_txt"] = 'Disable POP3';
 ?>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 7f008992f824a4b8b11c76da4967f1c31509706f..7ee5ce3e07a2552140b3239a98d967fd4964c208 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -23,10 +23,20 @@
     <td width="126" class="frmText11">{tmpl_var name='postfix_txt'}:</td>
     <td width="366" class="frmText11">{tmpl_var name='postfix'}</td>
   </tr>
+  <tr>
+    <td width="126" class="frmText11">{tmpl_var name='disableimap_txt'}:</td>
+    <td width="366" class="frmText11">{tmpl_var name='disableimap'}</td>
+  </tr>
+  <tr>
+    <td width="126" class="frmText11">{tmpl_var name='disablepop3_txt'}:</td>
+    <td width="366" class="frmText11">{tmpl_var name='disablepop3'}</td>
+  </tr>
+  <!--
   <tr>
     <td width="126" class="frmText11">{tmpl_var name='access_txt'}:</td>
     <td width="366" class="frmText11">{tmpl_var name='access'}</td>
   </tr>
+  -->
   <tr>
     <td class="frmText11">&nbsp;</td>
     <td class="frmText11">&nbsp;</td>