diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index d18440fa94bce00cb09082baf33c6c8e2f2584ee..935e802cfa0220b222a7bf7026ada51de7a31fe2 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1,2 +1,5 @@
 INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `active`, `ca_name`, `ca_issue`, `ca_wildcard`, `ca_iodef`, `ca_critical`) VALUES
-(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0);
\ No newline at end of file
+(NULL, 1, 1, 'riud', 'riud', '', 'Y', 'Amazon Trust Services', 'amazontrust.com', 'Y', '', 0);
+
+-- 5374-mail-last-accessed-frontend
+ALTER TABLE `mail_user` ADD `last_access` int(11) NULL DEFAULT NULL after `disabledoveadm`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 01c2e2d86724b754e022cf158e919d3ed972fb03..81e875d472e5d77501f71dd18d125cb6ede84b20 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1097,6 +1097,7 @@ CREATE TABLE `mail_user` (
   `disablelda` enum('n','y') NOT NULL default 'n',
   `disablelmtp` enum('n','y') NOT NULL default 'n',
   `disabledoveadm` enum('n','y') NOT NULL default 'n',
+  `last_access` int(11) NULL DEFAULT NULL,
   `disablequota-status` enum('n','y') NOT NULL default 'n',
   `disableindexer-worker` enum('n','y') NOT NULL default 'n',
   `last_quota_notification` date NULL default NULL,
diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 7c5b388536ec9d0a672d9a3e283d2a5d6b7adc97..2d7e29ae414772220ced4044c9d92918e08dad68 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -244,6 +244,13 @@ class quota_lib {
 			for($i=0;$i<sizeof($emails);$i++){
 				$email = $emails[$i]['email'];
 
+				if (empty($emails[$i]['last_access'])) {
+					$emails[$i]['last_access'] = $app->lng('never_accessed_txt');
+				}
+				else {
+					$emails[$i]['last_access'] = date($app->lng('conf_format_dateshort'), $emails[$i]['last_access']);
+				}
+
 				$emails[$i]['name'] = $app->functions->htmlentities($emails[$i]['name']);
 				$emails[$i]['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
 
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index d00c7dc1b381c9de60af300b6bd80a6f0ed3643e..0b3aec6c3dc9f302cddea6a1dcaca45b69a6a3a9 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 35bec0ab45f4164aa84e221b877e694127d08827..634e73be149786c9bf96922e847572c7d520c88a 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index 4195702e25102dead8bb294f5e17429489600724..bb7a061b16a544db6a8aaa5316e223f41ee262c0 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng
index 2d61af651a9dab14b178ccb11ab609af3218559b..ac29f1a251724b922c591dd229dfd4a6bb18a972 100644
--- a/interface/lib/lang/ca.lng
+++ b/interface/lib/lang/ca.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/cn.lng b/interface/lib/lang/cn.lng
index cbb6ace68a31c5b35f266dd8404817ae5d218310..36276d562cdb94dacc4f865bd4e6a0341616314c 100644
--- a/interface/lib/lang/cn.lng
+++ b/interface/lib/lang/cn.lng
@@ -185,4 +185,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 880f4fea117eed9761c8640855211723f0384f9b..c8c341077a0d79ccd537a72f0efd4642758524c5 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 6019ee769a25cb9e0cf4f9a03cc8304696bd9d21..feb06d2dfb9f0ed5349ff2f741601ada53dd73f2 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Website-Backup löschen';
 $wb['datalog_status_i_dns_template'] = 'Neue DNS-Vorlage erstellen';
 $wb['datalog_status_u_dns_template'] = 'DNS-Vorlage aktualisieren';
 $wb['datalog_status_d_dns_template'] = 'DNS-Vorlage löschen';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/dk.lng b/interface/lib/lang/dk.lng
index 6082b1a3919b4efeb0c46f1d7a74961b4f849b03..9a12db7751af796353bcfbe58de79f4b93381fec 100644
--- a/interface/lib/lang/dk.lng
+++ b/interface/lib/lang/dk.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index fb45cd8b68f0d426c0a79979e6dcec8aecd727ee..5e8b8068cad2c633e64b8dd09e37a4dde5e9ffac 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 866a1249decf22ba79c29e46580c49769475249e..e47f48575afcc2bf36aa37352233d5f79212faba 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -185,4 +185,8 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index bc2ead77a86825286abdd10af01c1e0d0bbdddfa..9e138ab5740ebf829c65012f67d2e8a5d45693bc 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index b8f1c502fc10a9ce10de3f7de7d53a11124286eb..1b4f8079610ea76dceec63e7da48479adb61493a 100644
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 273cc125dc891467e963b3cf1a707f7aa1ad3ad3..4e673d65be1e61671799438e2b409ef80c438f02 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index bf52fe0be5b925f1bfcc0f2fab33414c6f87a41a..3ea5a76d908d8b9cadbb0a79ff16764aee5b9b3a 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index 732e078f8a6e4363542ae2687d1b09e52ca0bc6e..1341a5328758b29cc138c6c93a78e2e61b65de45 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index 970f7d8396769aec3e8b6af2fd860e878a229bfd..fb9307e89784db2a1265fc868fccc823e28e5c4d 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index 235c86e8368b59aab772c9ead5d6eaadf1325cdf..403d2499be1cdd999230710b5b458fd7533021a0 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index 657b6128b11bb59a6c68369e5d6cd4aa9f231bc6..77c5cc4fbafae95fc7e42ec943eda39e7785f5aa 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 577c0ec70af717b22b3e6ba332f373d2fe08c986..b3386d906518658b74072878bfadd0d85b054402 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Laatst gebruikt';
+$wb['never_accessed_txt'] = 'Niet of onbekend';
 ?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index e33f45575e3dd815179261fb129c80a0dc700769..ff207c6dc38c8ff62a1452005951da2f25348be2 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index 95fb1f2ddb428e77e3c668157a93d58ccdaca544..ac74eb193d0f2cb326e863be5838624c6ddb317f 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 6ec3d59702c3f3f50ae50083d11243e5b0648d91..0e816ac1537733764e62490da621920e8d788d0f 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 0bf578468ed631cb56124bf8c04f9b9335b81b08..46c85fe4daff36e4cb093ad7729b12f44890e186 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index c175f9e54cb80b4a3c3aa413acff838d73842050..af5e5b4e66609c0f719a65748d99161f5a8c9f40 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index e39f39a92fa2e8240c0f4cc79999416a3cce782b..8e554ed467911ef783715fce71f220319e2aa2c5 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -184,4 +184,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index 8a0661a6af35d754e2da56e086b1330cb93860da..9a8f3b478ca9954f5266aa73b91db93b3d1365fc 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -185,4 +185,6 @@ $wb['datalog_status_d_web_backup'] = 'Delete website backup';
 $wb['datalog_status_i_dns_template'] = 'Create DNS template';
 $wb['datalog_status_u_dns_template'] = 'Update DNS template';
 $wb['datalog_status_d_dns_template'] = 'Delete DNS template';
+$wb['last_accessed_txt'] = 'Last accessed';
+$wb['never_accessed_txt'] = 'Never or unknown';
 ?>
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 7acd801864d3dbd6306457cd5a133ca5898f068a..1b7be1b803b3e808ece61a7aa5983932675c70b6 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -303,6 +303,12 @@ $form["tabs"]['mail'] = array (
 			'default'  => 'y',
 			'value'    => array(0 => 'n', 1 => 'y')
 		),
+		'mailbox_show_last_access' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default'  => 'y',
+			'value'    => array(0 => 'n', 1 => 'y')
+		),
 		'mailboxlist_webmail_link' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index 720efa7e1bd42ae617f46c11219aa7b00f82e52c..4eb3d443d82de3c2d8cf8a2cacbdb6bdb84d8e2f 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index bc3f41ed55a2095c9296ca7015631af736f5448b..e7c95b8ce2ea05364814f80070916b789af1b2d8 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index 71fdef7ecaa87e2c14cd4529c08dca7e6e0b6d9a..c6bf1f4221ce414f218a4ed5ebc8fd6d971252e8 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -110,3 +110,4 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng
index 41b9b3a8af9f86d447e9934a40261f4b5ed8990b..89ea62be2e3d06368db885fb2ce800ab6696c1c3 100644
--- a/interface/web/admin/lib/lang/ca_system_config.lng
+++ b/interface/web/admin/lib/lang/ca_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/cn_system_config.lng b/interface/web/admin/lib/lang/cn_system_config.lng
index 0f81926fb9938a4fdd754f02cc34e9eaa7c52053..eedf1f1029a19895dd51dba3c5b4284a9046e408 100644
--- a/interface/web/admin/lib/lang/cn_system_config.lng
+++ b/interface/web/admin/lib/lang/cn_system_config.lng
@@ -108,4 +108,5 @@ $wb['show_aps_menu_note_url_txt'] = '点击这里了解更多信息。';
 $wb['dns_show_zoneexport_txt'] = '显示区域导出。';
 $wb['le_caa_autocreate_options_txt'] = '在颁发 LE 时启用 CAA 记录的自动创建';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 49e716f60463f43468ed548a58051c25bc565161..6e6729d79d6a501b02b9c1e6cf4b3761af2668ff 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -110,3 +110,4 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 818c5322c542bc63d86ae27de218cf0d92571685..cbd2cc8eea6cf6a6ab3303d8baeae3288402a968 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Automatische Erstellung des CAA-Records bei LE Ausstellung aktivieren';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng
index 925951fb225955267e3cd4505c209b2d5db77874..8fb1c66db78229ac206b09559710059fca6e1733 100644
--- a/interface/web/admin/lib/lang/dk_system_config.lng
+++ b/interface/web/admin/lib/lang/dk_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index 7aa8702843893a30075e79160a2cd35033cca557..28d5968c8ba606bd876d3a689df836d20e68ee13 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index 509b927955e7c6299e216c8237d678c83bd199cc..6e0907c432f40281ccd5165fcd1ccc5fb578fce5 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -110,4 +110,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index be81d53bb8e1bffe99811e1ea842c3d9e150aae8..331a18a7b74cc13022581fcfd4e3a7398fd76594 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index 7151de5db23838e9a8a5d5e801523d999ea97558..2b2569cb989143a5f0fbff778a39b6de10a8a9f6 100644
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index 573e696db234707d2496f929b7417cbd0e7dd204..172442cea2453949e62eb08a1e351a46cccff596 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 24c4baa740fe9de9581e2ecb99982c99ff1e6722..a167f4e4a30c9b5f28ef48cb626e6556204935ac 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index c07b191866f1718503e052759d3041df937168f0..4a8c266677795096ff5e37650fb71ff34cd2d466 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index 33f97923d6a867d7ce8e45244a29f7302c46dc30..e37cd5b9670fbfc65034fb78d66f9d198ccb5875 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index 68ed721aa63265fb71f5f1e2a7eba81bee7175e6..adfeada35724cc1ba26eec25bbc4c5f71dca3218 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index e4c1352693f59bb50473d1aa6be813affc00ebdb..eeb2b1078fe351d6adba075f63e1eeb6eada3f05 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index 94f211d44b4e078eb82a43114551b072552d8ae1..d6d57639aa0465e48c30e37a471297da97103940 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index d3960b0f42bd9d41536c5a671ba80cb17ab42ded..0218e86eaf5a4cead426f4ad4b56885a81b74180 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index 6d840b4d485060ba421ef66f3a06a10c0ab1e113..320d45a8a274cdc22da9d93a4fa7638d91ecd412 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index 926d62b9fadd3bb7fd909fc8a3c2ba4b50be668b..d9bfa02c68c9ae12dcf13f1b8cee50059bd53064 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index 9ef38cb6bd251602d689678afa87722859e47b91..3000aa17359b6ce87f35fa8bd04a3de5c80d13aa 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index 2d389a294509c44fa908b10db5d468730b212ab1..f61f92247756f74ffa46c6726e37311638a6a16d 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index 900679dc1df412bc04c6595e1d77981d4d33e19e..8603147c96d066d4e244ef93a6f197d56b20f686 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index 8383f63166d2a433d271194e6164e2d4254403e2..98f02216898c8c943f2ad91daab7250d8528e625 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -109,4 +109,5 @@ $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index ac9271a9cf2c11854ad253d917d13fa06a6985ef..4731240bd2b80fb7e27b2901ab4ab424bfb002cb 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -34,6 +34,12 @@
                     {tmpl_var name='mailbox_show_custom_rules_tab'}
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='mailbox_show_last_access_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='mailbox_show_last_access'}
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mailboxlist_webmail_link_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/dashboard/dashlets/mailquota.php b/interface/web/dashboard/dashlets/mailquota.php
index a9434e58eaac846087c77738d9d131ebe4d51abe..e64b95e4e2bbd2409e06a0155d15427a9398d9aa 100644
--- a/interface/web/dashboard/dashlets/mailquota.php
+++ b/interface/web/dashboard/dashlets/mailquota.php
@@ -14,10 +14,14 @@ class dashlet_mailquota {
 		$wb = array();
 		$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dashlet_mailquota.lng';
 		if(is_file($lng_file)) include $lng_file;
+               $wb['last_accessed_txt'] = $app->lng('last_accessed_txt');
 		$tpl->setVar($wb);
 
+		$app->uses('getconf');
+		$mail_config = $app->getconf->get_global_config('mail');
+		$tpl->setVar('mailbox_show_last_access', $mail_config['mailbox_show_last_access']);
+
 		$emails = $app->quota_lib->get_mailquota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
-		//print_r($emails);
 
 		$has_mailquota = false;
 		if(is_array($emails) && !empty($emails)){
@@ -25,8 +29,6 @@ class dashlet_mailquota {
 				$email['email'] = $app->functions->idn_decode($email['email']);
 			}
 			unset($email);
-			// email username is quoted in quota.lib already, so no htmlentities here to prevent double encoding
-			//$emails = $app->functions->htmlentities($emails);
 			$tpl->setloop('mailquota', $emails);
 			$has_mailquota = isset($emails[0]['used']);
 		}
@@ -34,14 +36,4 @@ class dashlet_mailquota {
 
 		return $tpl->grab();
 	}
-
 }
-
-
-
-
-
-
-
-
-?>
diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm
index b30815456dcaec4fd5d55d8d71b3baabb998b5c3..c24b2e608a446fa726334e7c7db56a55d81dd0c4 100644
--- a/interface/web/dashboard/dashlets/templates/mailquota.htm
+++ b/interface/web/dashboard/dashlets/templates/mailquota.htm
@@ -6,6 +6,7 @@
 		  <th>{tmpl_var name='email_txt'}</th>
 		  <th>{tmpl_var name='name_txt'}</th>
 		  <th>{tmpl_var name='used_txt'}</th>
+		  <tmpl_if name="mailbox_show_last_access" op="==" value="y"><th>{tmpl_var name='last_accessed_txt'}</th></tmpl_if>
 		  <th colspan="2">{tmpl_var name='quota_txt'}</th>
 		</tr>
 	  </thead>
@@ -15,6 +16,7 @@
 			  <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{tmpl_var name='email'}">{tmpl_var name='email'}</a></td>
 			  <td>{tmpl_var name='name'}</td>
 			  <td>{tmpl_var name='used'}</td>
+			  <tmpl_if name="mailbox_show_last_access" op="==" value="y"><td>{tmpl_var name='last_access'}</td></tmpl_if>
 			  <td>{tmpl_var name='quota'}</td>
 			  {tmpl_if name="quota_raw" op="!=" value="-1"}<td>
 			  <div class='progress'>
@@ -31,6 +33,7 @@
 				<th></th>
 				<th>{tmpl_var name='total_txt'}</th>
 				<th>{tmpl_var name='total_used'}</th>
+				<tmpl_if name="mailbox_show_last_access" op="==" value="y"><th></th></tmpl_if>
 				<th colspan="2"></th>
 			</tr>
 		</tfoot>
diff --git a/interface/web/mail/list/mail_user.list.php b/interface/web/mail/list/mail_user.list.php
index 3e020ea603a9db377dbfacf1d467043db96a62a9..0ca521c2703ca0bee94b467dcc80e44a3779afd3 100644
--- a/interface/web/mail/list/mail_user.list.php
+++ b/interface/web/mail/list/mail_user.list.php
@@ -133,5 +133,13 @@ $liste["item"][] = array( 'field'  => "disablepop3",
 	'suffix' => "",
 	'width'  => "",
 	'value'  => array('n' => $app->lng('yes_txt'), 'y' => $app->lng('no_txt')));
+$liste["item"][] = array( 'field'  => "last_access",
+       'datatype' => "DATE",
+       'formtype' => "TEXT",
+       'op'  => "=",
+       'prefix' => "",
+       'suffix' => "",
+       'width'  => "",
+       'value'  => "");
 
 ?>
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 975133fdc47037c50f2fe5a107341164ac40c1af..d4e236b4bc2f6b49694742768440ec5bc5ae121f 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -136,6 +136,14 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("enable_custom_login", 0);
 		}
 
+		$app->tpl->setVar('mailbox_show_last_access', $mail_config['mailbox_show_last_access']);
+		if (!empty($this->dataRecord['last_access'])) {
+			$app->tpl->setVar("last_access", date($app->lng('conf_format_dateshort'), $this->dataRecord['last_access']));
+		}
+		else {
+			$app->tpl->setVar("last_access", $app->lng('never_accessed_txt'));
+		}
+
 		$csrf_token = $app->auth->csrf_token_get('mail_user_del');
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
diff --git a/interface/web/mail/mail_user_list.php b/interface/web/mail/mail_user_list.php
index fa26861c7931256524d33b6bdf7c99c35133c766..2d28d7a4cf9a347c7da685d278f1aa83fd1952e7 100644
--- a/interface/web/mail/mail_user_list.php
+++ b/interface/web/mail/mail_user_list.php
@@ -24,19 +24,20 @@ class list_action extends listform_actions {
 		global $app, $conf;
 
 		$app->uses('getconf');
-		$global_config = $app->getconf->get_global_config('mail');
+		$mail_config = $app->getconf->get_global_config('mail');
 
-		if($global_config['mailboxlist_webmail_link'] == 'y') {
+		if($mail_config['mailboxlist_webmail_link'] == 'y') {
 			$app->tpl->setVar('mailboxlist_webmail_link', 1);
 		} else {
 			$app->tpl->setVar('mailboxlist_webmail_link', 0);
 		}
 
-		if($global_config["enable_custom_login"] == "y") {
+		if($mail_config["enable_custom_login"] == "y") {
 			$app->tpl->setVar("enable_custom_login", 1);
 		} else {
 			$app->tpl->setVar("enable_custom_login", 0);
 		}
+		$app->tpl->setVar('mailbox_show_last_access', $mail_config['mailbox_show_last_access']);
 
 		parent::onShow();
 	}
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index f63f362d1bc54e2e436753e64bb2656f6f940051..367c4e8c2cb56fcde3c10b406f650956bab7844f 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -61,7 +61,9 @@
                 <tbody>
                 <tmpl_loop name="records">
                     <tr>
-                        <td class="copy-to-clipboard"><a class="copy-to-clipboard-icon-helper" href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='email'}">{tmpl_var name="email"}</a></td>
+                        <td class="copy-to-clipboard">
+                           <a class="copy-to-clipboard-icon-helper" href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="<tmpl_if name="mailbox_show_last_access" op="==" value="y"><tmpl_if name="last_access">{tmpl_var name='last_accessed_txt'}: {tmpl_var name='last_access'} </tmpl_if></tmpl_if>">{tmpl_var name="email"}</a>
+                        </td>
                         <tmpl_if name="enable_custom_login"><td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="login"}</a></td></tmpl_if>
                         <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
                         <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="autoresponder"}</a></td>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index a87e617ca940eae66ecca6a3abffb1871b21ac5e..00cd76d46c449bd8b2241dea78e840bd7ebb3b01 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -44,7 +44,10 @@
             <div class="form-group">
                 <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
                 <div class="col-sm-9">
-	                <input type="password" name="repeat_password" id="repeat_password" value="" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
+                       <input type="password" name="repeat_password" id="repeat_password" value="" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
+                       <tmpl_if name="mailbox_show_last_access" op="==" value="y"><tmpl_if name="id">{tmpl_var name='last_accessed_txt'}: {tmpl_var name='last_access'}</tmpl_if></tmpl_if>
+                </div>
+            </div>
             <div class="form-group">
 				<div class="col-sm-offset-3 col-sm-9">
 					<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>