diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Mail/MailDomain.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Mail/MailDomain.cs
index a452d66d..d93c54cd 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Mail/MailDomain.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Mail/MailDomain.cs
@@ -368,6 +368,10 @@ namespace WebsitePanel.Providers.Mail
 
         #region IceWarp
 
+        public bool UseDomainDiskQuota { get; set; }
+        public bool UseDomainLimits { get; set; }
+        public bool UseUserLimits { get; set; }
+
 	    public int MegaByteSendLimit { get; set; }
 	    public int NumberSendLimit { get; set; }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
index b622ae19..08ee1d7f 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
@@ -624,7 +624,10 @@ namespace WebsitePanel.Providers.Mail
                 DefaultUserQuotaInMB = Convert.ToInt32((object) domain.GetProperty("D_UserMailbox"))/1024,
                 DefaultUserMaxMessageSizeMegaByte = Convert.ToInt32((object) domain.GetProperty("D_UserMsg"))/1024,
                 DefaultUserMegaByteSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserMB")),
-                DefaultUserNumberSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserNumber"))
+                DefaultUserNumberSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserNumber")),
+                UseDomainDiskQuota = Convert.ToBoolean(ProviderSettings["UseDomainDiskQuota"]),
+                UseDomainLimits = Convert.ToBoolean(ProviderSettings["UseDomainLimits"]),
+                UseUserLimits = Convert.ToBoolean(ProviderSettings["UseUserLimits"])
             };
 
             return mailDomain;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IceWarp_EditAccount.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IceWarp_EditAccount.ascx.resx
index 946cd8c0..5c51215e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IceWarp_EditAccount.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/App_LocalResources/IceWarp_EditAccount.ascx.resx
@@ -270,4 +270,7 @@
   <data name="OlderMails.Text" xml:space="preserve">
     <value>Handle older mails</value>
   </data>
+  <data name="cbForwardOlder.Text" xml:space="preserve">
+    <value>Enable forwarding of older messages</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx
index 4d4122d3..aeae00bc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx
@@ -181,7 +181,7 @@
     <table width="100%">
         <tr>
             <td colspan="2">
-                <asp:CheckBox ID="cbForwardOlder" runat="server" meta:resourcekey="cbDeleteOlder" AutoPostBack="True" OnCheckedChanged="cbForwardOlder_CheckedChanged"
+                <asp:CheckBox ID="cbForwardOlder" runat="server" meta:resourcekey="cbForwardOlder" AutoPostBack="True" OnCheckedChanged="cbForwardOlder_CheckedChanged"
                     Text="Enable forwarding of older messages"></asp:CheckBox>
             </td>
         </tr>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditDomain.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditDomain.ascx.cs
index c4e36d44..50182f1b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditDomain.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditDomain.ascx.cs
@@ -38,29 +38,6 @@ namespace WebsitePanel.Portal.ProviderControls
 {
     public partial class IceWarp_EditDomain : WebsitePanelControlBase, IMailEditDomainControl
     {
-        private StringDictionary _serviceSettings;
-
-        private StringDictionary ServiceSettings
-        {
-            get
-            {
-                if (_serviceSettings != null)
-                    return _serviceSettings;
-
-                _serviceSettings = new StringDictionary();
-                var domain = ES.Services.MailServers.GetMailDomain(PanelRequest.ItemID);
-
-                var settings = ES.Services.Servers.GetServiceSettings(domain.ServiceId);
-
-                foreach (var settingPair in settings.Select(setting => setting.Split('=')))
-                {
-                    _serviceSettings.Add(settingPair[0], settingPair[1]);
-                }
-
-                return _serviceSettings;
-            }
-        }
-
         protected void Page_Load(object sender, EventArgs e)
         {
             AdvancedSettingsPanel.Visible = PanelSecurity.EffectiveUser.Role == UserRole.Administrator;
@@ -77,9 +54,9 @@ namespace WebsitePanel.Portal.ProviderControls
         public void BindItem(MailDomain item)
         {
             // Hide/show controls when not enabled on service level
-            rowMaxDomainDiskSpace.Visible = ServiceSettings.ContainsKey("UseDomainDiskQuota") && Convert.ToBoolean(ServiceSettings["UseDomainDiskQuota"]);
-            rowDomainLimits.Visible = ServiceSettings.ContainsKey("UseDomainLimits") && Convert.ToBoolean(ServiceSettings["UseDomainLimits"]);
-            rowUserLimits.Visible = ServiceSettings.ContainsKey("UseUserLimits") && Convert.ToBoolean(ServiceSettings["UseUserLimits"]);
+            rowMaxDomainDiskSpace.Visible = item.UseDomainDiskQuota;
+            rowDomainLimits.Visible = item.UseDomainLimits;
+            rowUserLimits.Visible = item.UseUserLimits;
 
             txtMaxDomainDiskSpace.Text = item.MaxDomainSizeInMB.ToString();
             txtMaxDomainUsers.Text = item.MaxDomainUsers.ToString();