diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index 98e7ff875..839741fa7 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -607,7 +607,7 @@
 			return false;
 		}
 
-		if (bFast)
+		if (bFast || 50 > this.oContentScrollable.scrollTop())
 		{
 			this.oContentScrollable.scrollTop(0);
 		}
diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index 8755f4e6c..6beebf39a 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -325,7 +325,7 @@
 		this.testingDone(false);
 		this.testingImapError(false);
 		this.testingSmtpError(false);
-	}
+	};
 
 	DomainPopupView.prototype.onHide = function ()
 	{
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 009fbf9a4..b31d51587 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -640,7 +640,18 @@
 	{
 		if (this.oMessageScrollerDom)
 		{
-			this.oMessageScrollerDom.scrollTop(0);
+			if (50 < this.oMessageScrollerDom.scrollTop())
+			{
+				this.oMessageScrollerDom
+					.scrollTop(50)
+					.animate({'scrollTop': 0}, 200)
+				;
+			}
+			else
+			{
+				this.oMessageScrollerDom.scrollTop(0);
+			}
+
 			Utils.windowResize();
 		}
 	};