diff --git a/dev/Remote/User/Ajax.js b/dev/Remote/User/Ajax.js
index e76ff4e22..3d4cacea2 100644
--- a/dev/Remote/User/Ajax.js
+++ b/dev/Remote/User/Ajax.js
@@ -359,7 +359,7 @@
 				'Limit': iLimit,
 				'Search': sSearch,
 				'UidNext': Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '',
-				'UseThreads': AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0',
+				'UseThreads': AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0'
 			}, '' === sSearch ? Consts.Defaults.DefaultAjaxTimeout : Consts.Defaults.SearchAjaxTimeout, '', bSilent ? [] : ['MessageList']);
 		}
 	};
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 8a505c4d0..f8b77581f 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -483,7 +483,7 @@
 					Cache.initMessageFlagsFromCache(oMessage);
 
 					this.message(this.staticMessage.populateByMessageListItem(oMessage));
-					oMessage = this.message(),
+					oMessage = this.message();
 
 					bNew = true;
 				}
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index 58c78b704..06209bcfa 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -252,7 +252,7 @@
 				if (-1 < iIndex)
 				{
 					aResult[0] = true;
-					aResult[1] = (iIndex + 1) + '&nbsp;/&nbsp;' + iLen;
+					aResult[1] = (iIndex + 1) + '/' + iLen;
 					aResult[2] = aThreads[iIndex];
 					aResult[3] = 0 < iIndex && aThreads[iIndex - 1] ? aThreads[iIndex - 1] : '';
 					aResult[4] = aThreads[iIndex + 1] ? aThreads[iIndex + 1] : '';
diff --git a/package.json b/package.json
index f3d3bf476..4aaf77d17 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
-	"version": "1.8.1",
-	"release": "281",
+	"version": "1.8.2",
+	"release": "284",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 83dd2f66b..86c20f23a 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -1424,7 +1424,6 @@ class MailClient
 	 * @param string $sFolderHash
 	 * @param array $aIndexOrUids
 	 * @param \MailSo\Cache\CacheClient $oCacher
-	 * @param int $iThreadLimit = 50
 	 * @param bool $bCacheOnly = false
 	 *
 	 * @return array
@@ -1433,9 +1432,9 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\Exception
 	 * @throws \MailSo\Imap\Exceptions\Exception
 	 */
-	public function MessageListThreadsMap($sFolderName, $sFolderHash, $aIndexOrUids, $oCacher, $iThreadLimit = 50, $bCacheOnly = false)
+	public function MessageListThreadsMap($sFolderName, $sFolderHash, $aIndexOrUids, $oCacher, $bCacheOnly = false)
 	{
-		$iThreadLimit = \is_int($iThreadLimit) && 0 < $iThreadLimit ? $iThreadLimit : 0;
+		$iThreadLimit = \MailSo\Config::$LargeThreadLimit;
 
 		$sSearchHash = '';
 		if (0 < \MailSo\Config::$MessageListDateFilter)
@@ -1829,8 +1828,7 @@ class MailClient
 		$aResult = array();
 		if (0 < \strlen($sFolderName) && 0 < \strlen($sFolderHash)  && 0 < \strlen($sUid) && $oCacher && $oCacher->IsInited())
 		{
-			$mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher,
-				\MailSo\Config::$LargeThreadLimit, true);
+			$mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher, true);
 
 			if (\is_array($mThreads))
 			{
@@ -1957,7 +1955,7 @@ class MailClient
 
 					$aThreads = $this->MessageListThreadsMap(
 						$oMessageCollection->FolderName, $oMessageCollection->FolderHash,
-						$aIndexOrUids, $oCacher, \MailSo\Config::$LargeThreadLimit);
+						$aIndexOrUids, $oCacher);
 
 					$aNewIndexOrUids = array();
 					foreach ($aIndexOrUids as $iUid)
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 c691b7491..9cdc293b6 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
@@ -186,8 +186,8 @@
 							<a class="btn btn-thin" data-tooltip-placement="bottom" data-bind="command: threadForwardCommand">
 								<i class="icon-left-middle"></i>
 							</a>
-							<a class="btn btn-thin" data-tooltip-placement="bottom">
-								<b data-bind="html: viewThreadsControlDesc"></b>
+							<a class="btn btn-thin" data-tooltip-placement="bottom" style="display: none">
+								<b data-bind="text: viewThreadsControlDesc"></b>
 							</a>
 							<a class="btn btn-thin" data-tooltip-placement="bottom" data-bind="command: threadBackCommand">
 								<i class="icon-right-middle"></i>
@@ -205,7 +205,10 @@
 									<span class="flagParent">
 										<i class="icon-star-empty flagOff" data-bind="css: {'icon-star flagOn': viewIsFlagged, 'icon-star-empty flagOff': !viewIsFlagged()}"></i>
 									</span>
-									<b style="color:red;margin-right:5px" data-bind="visible: viewIsImportant">!</b>
+									<span class="thread-counter" data-bind="visible: viewThreadsControlVisibility"
+										style="font-weight: normal; margin-right: 5px">(<span
+											data-bind="text: viewThreadsControlDesc"></span>)</span>
+									<b style="color: red; margin-right: 5px" data-bind="visible: viewIsImportant">!</b>
 									<span class="subject" data-bind="text: viewSubject, title: viewSubject"></span>
 									<span class="i18n emptySubjectText" data-i18n-text="MESSAGE/EMPTY_SUBJECT_TEXT"></span>
 								</div>
@@ -276,6 +279,7 @@
 						<div class="content g-scrollbox" tabindex="0" data-bind="hasfocus: messageDomFocused">
 							<div class="content-wrapper">
 								<div>
+
 									<span class="buttonUp" data-bind="click: scrollMessageToTop">
 										<i class="icon-up"></i>
 									</span>