diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js
index 1196fbd2d..47a54b059 100644
--- a/dev/Common/Enums.js
+++ b/dev/Common/Enums.js
@@ -210,7 +210,8 @@ export const ClientSideKeyName = {
 	'LastReplyAction': 6,
 	'LastSignMe': 7,
 	'ComposeLastIdentityID': 8,
-	'MessageHeaderFullInfo': 9
+	'MessageHeaderFullInfo': 9,
+	'MessageAttachmnetControls': 10
 };
 
 /**
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 7731b8f79..abe8b950d 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -132,6 +132,10 @@ class MessageViewMailBoxUserView extends AbstractViewNext
 
 		this.showAttachmnetControls = ko.observable(false);
 
+		this.showAttachmnetControlsState = (v) => {
+			Local.set(ClientSideKeyName.MessageAttachmnetControls, !!v);
+		};
+
 		this.allowAttachmnetControls = ko.computed(
 			() => 0 < this.attachmentsActions().length && Settings.capa(Capa.AttachmentsActions)
 		);
@@ -320,6 +324,12 @@ class MessageViewMailBoxUserView extends AbstractViewNext
 			if (message)
 			{
 				this.showAttachmnetControls(false);
+				if (Local.get(ClientSideKeyName.MessageAttachmnetControls))
+				{
+					_.delay(() => {
+						this.showAttachmnetControls(true);
+					}, Magics.Time50ms);
+				}
 
 				if (this.viewHash !== message.hash)
 				{
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 6381baff6..45b4611f0 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -389,7 +389,7 @@
 													</div>
 												</li>
 											</ul>
-											<i class="icon-cog controls-handle" data-bind="visible: allowAttachmnetControls() && !showAttachmnetControls(), click: function () { showAttachmnetControls(true) }"></i>
+											<i class="icon-cog controls-handle" data-bind="visible: allowAttachmnetControls() && !showAttachmnetControls(), click: function () { showAttachmnetControls(true); showAttachmnetControlsState(true); }"></i>
 										</div>
 
 										<div class="attachmentsControls"
@@ -430,7 +430,7 @@
 											</span>
 
 											<button type="button" class="close" style="margin-right: 5px;"
-												data-bind="click: function () { showAttachmnetControls(false); }">×</button>
+												data-bind="click: function () { showAttachmnetControls(false); showAttachmnetControlsState(false); }">×</button>
 										</div>
 									</div>