Index: modules/univention/admin/handlers/users/user.py
===================================================================
--- modules/univention/admin/handlers/users/user.py	(Revision 13073)
+++ modules/univention/admin/handlers/users/user.py	(Arbeitskopie)
@@ -565,6 +565,17 @@
 			dontsearch=1,
 			identifies=0
 		),
+	'mailMailQuota': univention.admin.property(
+			short_description=_('Quota Limit'),
+			long_description=_('Specifies maximum mailstorage size'),
+			syntax=univention.admin.syntax.integer,
+			multivalue=0,
+			options=['mail', 'groupware'],
+			required=0,
+			may_change=1,
+			dontsearch=1,
+			identifies=0
+		),
 	'mailAlternativeAddress': univention.admin.property(
 			short_description=_('Alternative e-mail addresses'),
 			long_description='',
@@ -1086,6 +1097,7 @@
 		[univention.admin.field("mailPrimaryAddress")],
 		[univention.admin.field("mailAlternativeAddress")],
 		[univention.admin.field("mailGlobalSpamFolder")],
+		[univention.admin.field("mailMailQuota")],
 	]),
 	univention.admin.tab(_('Contact'),_('Contact information'),[
 		[univention.admin.field("e-mail"), univention.admin.field("phone")],
@@ -1365,6 +1377,7 @@
 mapping.register('mailPrimaryAddress', 'mailPrimaryAddress', None, univention.admin.mapping.ListToLowerString)
 mapping.register('mailAlternativeAddress', 'mailAlternativeAddress', univention.admin.mapping.ListToLowerListUniq)
 mapping.register('mailGlobalSpamFolder', 'mailGlobalSpamFolder', None, univention.admin.mapping.ListToString)
+mapping.register('mailMailQuota', 'mailMailQuota', None, univention.admin.mapping.ListToString)
 
 mapping.register('street', 'street', None, univention.admin.mapping.ListToString)
 mapping.register('e-mail', 'mail')