diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js
index 3d995ad58..c09f028dd 100644
--- a/dev/Model/Attachment.js
+++ b/dev/Model/Attachment.js
@@ -301,7 +301,7 @@
 			else if (-1 < Utils.inArray(aParts[1],
 				['pdf', 'x-pdf']))
 			{
-				sText = 'pdf'
+				sText = 'pdf';
 				sClass = 'icon-none';
 			}
 	//		else if (-1 < Utils.inArray(aParts[1], [
@@ -311,7 +311,7 @@
 	//			sClass = 'icon-console';
 	//		}
 			else if (-1 < Utils.inArray(sMimeType, [
-				'application/pgp-signature'
+				'application/pgp-signature', 'application/pkcs7-signature'
 			]))
 			{
 				sClass = 'icon-file-certificate';
diff --git a/dev/Storage/User/Remote.js b/dev/Storage/User/Remote.js
index 8f5d9f32c..868178a14 100644
--- a/dev/Storage/User/Remote.js
+++ b/dev/Storage/User/Remote.js
@@ -226,7 +226,8 @@
 	 */
 	RemoteUserStorage.prototype.accountsCounts = function (fCallback)
 	{
-		this.defaultRequest(fCallback, 'AccountsCounts');
+		return !!fCallback; // TODO
+//		this.defaultRequest(fCallback, 'AccountsCounts');
 	};
 
 	/**
diff --git a/package.json b/package.json
index f14556c78..c5fa44de6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.7.2",
-	"release": "224",
+	"release": "226",
 	"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/Imap/BodyStructure.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index 478a5c597..eaf460485 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -262,7 +262,8 @@ class BodyStructure
 	 */
 	public function IsPgpSignature()
 	{
-		return 'application/pgp-signature' === \strtolower($this->ContentType());
+		return \in_array(\strtolower($this->ContentType()),
+			array('application/pgp-signature', 'application/pkcs7-signature'));
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
index 773f09b76..638fcbe7d 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
@@ -8386,7 +8386,6 @@ class Actions
 					'Folder' => $mResponse->FolderName,
 					'FolderHash' => $mResponse->FolderHash,
 					'UidNext' => $mResponse->UidNext,
-					'Optimized' => $mResponse->Optimized,
 					'NewMessages' => $this->responseObject($mResponse->NewMessages),
 					'LastCollapsedThreadUids' => $mResponse->LastCollapsedThreadUids,
 					'Offset' => $mResponse->Offset,
@@ -8406,6 +8405,7 @@ class Actions
 					'Namespace' => $mResponse->GetNamespace(),
 					'FoldersHash' => isset($mResponse->FoldersHash) ? $mResponse->FoldersHash : '',
 					'IsThreadsSupported' => $mResponse->IsThreadsSupported,
+					'Optimized' => $mResponse->Optimized,
 					'SystemFolders' => isset($mResponse->SystemFolders) && \is_array($mResponse->SystemFolders) ? $mResponse->SystemFolders : array()
 				));
 			}