diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/MailServers/MailServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/MailServers/MailServerController.cs
index 7ae608e5..2ac8a129 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/MailServers/MailServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/MailServers/MailServerController.cs
@@ -1505,6 +1505,13 @@ namespace WebsitePanel.EnterpriseServer
 		/// <returns>True if quota will exceed. Otherwise, false.</returns>
 		protected bool VerifyIfQuotaWillBeExceeded(int packageId, string quotaName, int numberOfItemsToAdd)
 		{
+            // Don't bother to check quota if the number of items to add is zero or less otherwise IsQuotasWillExceed 
+            // will fail when quota is set to 0 on lists or groups and still thera are no items to import
+		    if (numberOfItemsToAdd <= 0)
+		    {
+		        return false;
+		    }
+
 			bool result = false;
 
 			QuotaValueInfo quotaInfo = PackageController.GetPackageQuota(packageId, quotaName);