diff --git a/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx b/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx
index 1842c24d3..0e2fe34f4 100644
--- a/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx
+++ b/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx
@@ -47,5 +47,13 @@
 			    <asp:TextBox id="txtForward" runat="server" Width="200px" CssClass="form-control"></asp:TextBox>
 		    </td>
 	    </tr>
+		<tr>
+            <td class="SubHead">
+            </td>
+            <td class="Normal">
+                <asp:CheckBox ID="chkDeleteOnForward" runat="server" meta:resourcekey="chkDeleteOnForward"
+                    Text="Delete Message on Forward"></asp:CheckBox>
+            </td>
+        </tr>
     </table>
 </asp:Panel>
\ No newline at end of file
diff --git a/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.cs b/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.cs
index 167c728cb..45e94d201 100644
--- a/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.cs
+++ b/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.cs
@@ -58,6 +58,7 @@ public void BindItem(MailAccount item)
             txtSubject.Text = item.ResponderSubject;
             txtMessage.Text = item.ResponderMessage;
             txtForward.Text = item.ForwardingAddresses != null ? String.Join("; ", item.ForwardingAddresses) : "";
+            chkDeleteOnForward.Checked = item.DeleteOnForward;
         }
 
         public void SaveItem(MailAccount item)
@@ -67,6 +68,7 @@ public void SaveItem(MailAccount item)
             item.ResponderSubject = txtSubject.Text;
             item.ResponderMessage = txtMessage.Text;
             item.ForwardingAddresses = Utils.ParseDelimitedString(txtForward.Text, ';', ' ', ',');
+            item.DeleteOnForward = chkDeleteOnForward.Checked;
         }
     }
 }
diff --git a/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.designer.cs b/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.designer.cs
index 9f9a8bd6b..d0f05a988 100644
--- a/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.designer.cs
+++ b/SolidCP/Sources/SolidCP.WebPortal/DesktopModules/SolidCP/ProviderControls/MailEnable_EditAccount.ascx.designer.cs
@@ -1,50 +1,19 @@
-// Copyright (c) 2016, SolidCP
-// SolidCP is distributed under the Creative Commons Share-alike license
-// 
-// SolidCP is a fork of WebsitePanel:
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3074
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SolidCP.Portal.ProviderControls {
-    
-    
-    public partial class MailEnable_EditAccount {
-        
+namespace SolidCP.Portal.ProviderControls
+{
+
+
+    public partial class MailEnable_EditAccount
+    {
+
         /// <summary>
         /// lblReplyTo control.
         /// </summary>
@@ -53,7 +22,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblReplyTo;
-        
+
         /// <summary>
         /// txtReplyTo control.
         /// </summary>
@@ -62,7 +31,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtReplyTo;
-        
+
         /// <summary>
         /// secAutoresponder control.
         /// </summary>
@@ -71,7 +40,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::SolidCP.Portal.CollapsiblePanel secAutoresponder;
-        
+
         /// <summary>
         /// AutoresponderPanel control.
         /// </summary>
@@ -80,7 +49,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel AutoresponderPanel;
-        
+
         /// <summary>
         /// lblResponderEnabled control.
         /// </summary>
@@ -89,7 +58,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblResponderEnabled;
-        
+
         /// <summary>
         /// chkResponderEnabled control.
         /// </summary>
@@ -98,7 +67,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkResponderEnabled;
-        
+
         /// <summary>
         /// lblSubject control.
         /// </summary>
@@ -107,7 +76,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblSubject;
-        
+
         /// <summary>
         /// txtSubject control.
         /// </summary>
@@ -116,7 +85,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtSubject;
-        
+
         /// <summary>
         /// lblMessage control.
         /// </summary>
@@ -125,7 +94,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblMessage;
-        
+
         /// <summary>
         /// txtMessage control.
         /// </summary>
@@ -134,7 +103,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtMessage;
-        
+
         /// <summary>
         /// secForwarding control.
         /// </summary>
@@ -143,7 +112,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::SolidCP.Portal.CollapsiblePanel secForwarding;
-        
+
         /// <summary>
         /// ForwardingPanel control.
         /// </summary>
@@ -152,7 +121,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel ForwardingPanel;
-        
+
         /// <summary>
         /// lblForwardTo control.
         /// </summary>
@@ -161,7 +130,7 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblForwardTo;
-        
+
         /// <summary>
         /// txtForward control.
         /// </summary>
@@ -170,5 +139,14 @@ public partial class MailEnable_EditAccount {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtForward;
+
+        /// <summary>
+        /// chkDeleteOnForward control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkDeleteOnForward;
     }
 }