Update reply subject function

dev/Common/Utils.js

@@ -439,22 +439,106 @@ Utils.removeSelection = function ()
  */
 Utils.replySubjectAdd = function (sPrefix, sSubject)
 {
+	sPrefix = Utils.trim(sPrefix.toUpperCase());
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
 	var
-		oMatch = null,
+		iIndex = 0,
-		sResult = Utils.trim(sSubject)
+		sResult = '',
+		bDrop = false,
+		sTrimmedPart = '',
+		aSubject = [],
+		aParts = [],
+		bRe = 'RE' === sPrefix,
+		bFwd = 'FWD' === sPrefix,
+		bPrefixIsRe = !bFwd
 	;
 
-	if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
+	if ('' !== sSubject)
-		null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
 	{
-		sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
+		bDrop = false;
+
+		aParts = sSubject.split(':');
+		for (iIndex = 0; iIndex < aParts.length; iIndex++)
+		{
+			sTrimmedPart = Utils.trim(aParts[iIndex]);
+			if (!bDrop && 
+					(/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart))
+				)
+			{
+				if (!bRe)
+				{
+					bRe = !!(/^RE/i.test(sTrimmedPart));
+				}
+				
+				if (!bFwd)
+				{
+					bFwd = !!(/^FWD/i.test(sTrimmedPart));
+				}
+			}
+			else
+			{
+				aSubject.push(aParts[iIndex]);
+				bDrop = true;
+			}
+		}
+
+		if (0 < aSubject.length)
+		{
+			sResult = Utils.trim(aSubject.join(':'));
+		}
+	}
+
+	if (bPrefixIsRe)
+	{
+		bRe = false;
 	}
 	else
 	{
-		sResult = sPrefix + ': ' + sSubject;
+		bFwd = false;
 	}
 
-	return sResult.replace(/[\s]+/g, ' ');
+	return Utils.trim(
+		(bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
+		(bRe ? 'Re: ' : '') +
+		(bFwd ? 'Fwd: ' : '') +
+		sResult
+	);
+};
+
+
+/**
+ * @param {string} sSubject
+ * @return {string}
+ */
+Utils.fixLongSubject = function (sSubject)
+{
+	var
+		iLimit = 30,
+		mReg = /^Re([\[\(]([\d]+)[\]\)]|):[\s]{0,3}Re([\[\(]([\d]+)[\]\)]|):/ig,
+		oMatch = null
+	;
+
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
+	do
+	{
+		iLimit--;
+
+		oMatch = mReg.exec(sSubject);
+		if (!oMatch || Utils.isUnd(oMatch[0]))
+		{
+			oMatch = null;
+		}
+
+		if (oMatch)
+		{
+			sSubject = sSubject.replace(mReg, 'Re:');
+		}
+	}
+	while (oMatch || 0 < iLimit);
+
+	return sSubject.replace(/[\s]+/, ' ');
 };
 
 /**
@@ -492,10 +576,11 @@ Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
 };
 
 /**
+ * @deprecated
  * @param {string} sSubject
  * @return {string}
  */
-Utils.fixLongSubject = function (sSubject)
+Utils._fixLongSubject_ = function (sSubject)
 {
 	var
 		iCounter = 0,

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -6954,14 +6954,14 @@ class Actions
 		$aResult = array('', '');
 		if (0 < \strlen($sSubject))
 		{
-			$sDrop = false;
+			$bDrop = false;
 			$aPrefix = array();
 			$aSuffix = array();
 
 			$aParts = \explode(':', $sSubject);
 			foreach ($aParts as $sPart)
 			{
-				if (!$sDrop &&
+				if (!$bDrop &&
 					(\preg_match('/^(RE|FWD)$/i', \trim($sPart)) || \preg_match('/^(RE|FWD)[\[\(][\d]+[\]\)]$/i', \trim($sPart))))
 				{
 					$aPrefix[] = $sPart;
@@ -6969,7 +6969,7 @@ class Actions
 				else
 				{
 					$aSuffix[] = $sPart;
-					$sDrop = true;
+					$bDrop = true;
 				}
 			}
 

rainloop/v/0.0.0/static/css/app.css

@@ -637,7 +637,7 @@
 	border-radius: 8px;
 }
 
-
+
 /*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
 
 /* =============================================================================
@@ -1142,7 +1142,7 @@ table {
     border-collapse: collapse;
     border-spacing: 0;
 }
-
+
 @charset "UTF-8";
 
 @font-face {
@@ -1513,7 +1513,7 @@ table {
 .icon-resize-out:before {
   content: "\e06d";
 }
-
+
 /** initial setup **/
 .nano {
 /*
@@ -1630,7 +1630,7 @@ table {
 .nano > .pane2:hover > .slider2, .nano > .pane2.active > .slider2 {
 	background-color: rgba(0, 0, 0, 0.4);
 }
-
+
 /* Magnific Popup CSS */
 .mfp-bg {
   top: 0;
@@ -1995,7 +1995,7 @@ img.mfp-img {
   right: 0;
   padding-top: 0; }
 
-
+
 
 /* overlay at start */
 .mfp-fade.mfp-bg {
@@ -2041,7 +2041,7 @@ img.mfp-img {
   -moz-transform: translateX(50px);
   transform: translateX(50px);
 }
-
+
 .simple-pace {
 	-webkit-pointer-events: none;
 	pointer-events: none;
@@ -2112,7 +2112,7 @@ img.mfp-img {
 @keyframes simple-pace-stripe-animation {
 	0% { transform: none; transform: none; }
 	100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
-}
+}
 .inputosaurus-container {
 	background-color:#fff;
 	border:1px solid #bcbec0;
@@ -2180,7 +2180,7 @@ img.mfp-img {
 	box-shadow:none;
 }
 .inputosaurus-input-hidden { display:none; }
-
+
 .flag-wrapper {
 	width: 24px;
 	height: 16px;
@@ -2226,7 +2226,7 @@ img.mfp-img {
 .flag.flag-pt-br {background-position: -192px -11px}
 
 .flag.flag-cn, .flag.flag-zh-tw, .flag.flag-zh-cn, .flag.flag-zh-hk {background-position: -208px -22px}
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 .clearfix {
   *zoom: 1;

rainloop/v/0.0.0/static/js/admin.js

@@ -78,7 +78,7 @@ var
 
 	NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
 ;
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /*jshint onevar: false*/
@@ -87,7 +87,7 @@ var
  */
 var RL = null;
 /*jshint onevar: true*/
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -243,7 +243,7 @@ if (Globals.bAllowPdfPreview && navigator && navigator.mimeTypes)
 		return oType && 'application/pdf' === oType.type;
 	});
 }
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 Consts.Defaults = {};
@@ -363,7 +363,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
  * @type {string}
  */
 Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -794,7 +794,7 @@ Enums.Notification = {
 	'UnknownNotification': 999,
 	'UnknownError': 999
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 Utils.trim = $.trim;
@@ -1236,22 +1236,106 @@ Utils.removeSelection = function ()
  */
 Utils.replySubjectAdd = function (sPrefix, sSubject)
 {
+	sPrefix = Utils.trim(sPrefix.toUpperCase());
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
 	var
-		oMatch = null,
+		iIndex = 0,
-		sResult = Utils.trim(sSubject)
+		sResult = '',
+		bDrop = false,
+		sTrimmedPart = '',
+		aSubject = [],
+		aParts = [],
+		bRe = 'RE' === sPrefix,
+		bFwd = 'FWD' === sPrefix,
+		bPrefixIsRe = !bFwd
 	;
 
-	if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
+	if ('' !== sSubject)
-		null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
 	{
-		sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
+		bDrop = false;
+
+		aParts = sSubject.split(':');
+		for (iIndex = 0; iIndex < aParts.length; iIndex++)
+		{
+			sTrimmedPart = Utils.trim(aParts[iIndex]);
+			if (!bDrop && 
+					(/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart))
+				)
+			{
+				if (!bRe)
+				{
+					bRe = !!(/^RE/i.test(sTrimmedPart));
+				}
+				
+				if (!bFwd)
+				{
+					bFwd = !!(/^FWD/i.test(sTrimmedPart));
+				}
+			}
+			else
+			{
+				aSubject.push(aParts[iIndex]);
+				bDrop = true;
+			}
+		}
+
+		if (0 < aSubject.length)
+		{
+			sResult = Utils.trim(aSubject.join(':'));
+		}
+	}
+
+	if (bPrefixIsRe)
+	{
+		bRe = false;
 	}
 	else
 	{
-		sResult = sPrefix + ': ' + sSubject;
+		bFwd = false;
 	}
 
-	return sResult.replace(/[\s]+/g, ' ');
+	return Utils.trim(
+		(bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
+		(bRe ? 'Re: ' : '') +
+		(bFwd ? 'Fwd: ' : '') +
+		sResult
+	);
+};
+
+
+/**
+ * @param {string} sSubject
+ * @return {string}
+ */
+Utils.fixLongSubject = function (sSubject)
+{
+	var
+		iLimit = 30,
+		mReg = /^Re([\[\(]([\d]+)[\]\)]|):[\s]{0,3}Re([\[\(]([\d]+)[\]\)]|):/ig,
+		oMatch = null
+	;
+
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
+	do
+	{
+		iLimit--;
+
+		oMatch = mReg.exec(sSubject);
+		if (!oMatch || Utils.isUnd(oMatch[0]))
+		{
+			oMatch = null;
+		}
+
+		if (oMatch)
+		{
+			sSubject = sSubject.replace(mReg, 'Re:');
+		}
+	}
+	while (oMatch || 0 < iLimit);
+
+	return sSubject.replace(/[\s]+/, ' ');
 };
 
 /**
@@ -1289,10 +1373,11 @@ Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
 };
 
 /**
+ * @deprecated
  * @param {string} sSubject
  * @return {string}
  */
-Utils.fixLongSubject = function (sSubject)
+Utils._fixLongSubject_ = function (sSubject)
 {
 	var
 		iCounter = 0,
@@ -2701,7 +2786,7 @@ Utils.detectDropdownVisibility = _.debounce(function () {
 		return oItem.hasClass('open');
 	}));
 }, 50);
-
+
 /*jslint bitwise: true*/
 // Base64 encode / decode
 // http://www.webtoolkit.info/
@@ -2865,7 +2950,7 @@ Base64 = {
 	}
 };
 
-/*jslint bitwise: false*/
+/*jslint bitwise: false*/
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 ko.bindingHandlers.tooltip = {
@@ -3708,7 +3793,7 @@ ko.observable.fn.validateFunc = function (fFunc)
 
 	return this;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4014,7 +4099,7 @@ LinkBuilder.prototype.socialFacebook = function ()
 {
 	return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4110,7 +4195,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
 };
 
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4186,7 +4271,7 @@ CookieDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4259,7 +4344,7 @@ LocalStorageDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4304,7 +4389,7 @@ LocalStorage.prototype.get = function (iKey)
 {
 	return this.oDriver ? this.oDriver.get('p' + iKey) : null;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4319,7 +4404,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
 {
 
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4414,7 +4499,7 @@ KnoinAbstractViewModel.prototype.registerPopupKeyDown = function ()
 		return true;
 	});
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4492,7 +4577,7 @@ KnoinAbstractScreen.prototype.__start = function ()
 		this.oCross = oRoute;
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4908,7 +4993,7 @@ Knoin.prototype.bootstart = function ()
 };
 
 kn = new Knoin();
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5274,7 +5359,7 @@ EmailModel.prototype.inputoTagLine = function ()
 {
 	return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5320,7 +5405,7 @@ ContactTagModel.prototype.toLine = function (bEncodeHtml)
 	return (Utils.isUnd(bEncodeHtml) ? false : !!bEncodeHtml) ?
 		Utils.encodeHtml(this.name()) : this.name();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5617,7 +5702,7 @@ PopupsDomainViewModel.prototype.clearForm = function ()
 	this.smtpAuth(true);
 	this.whiteList('');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5761,7 +5846,7 @@ PopupsPluginViewModel.prototype.onBuild = function ()
 		return false;
 	}, this));
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5879,7 +5964,7 @@ PopupsActivateViewModel.prototype.validateSubscriptionKey = function ()
 {
 	var sValue = this.key();
 	return '' === sValue || !!/^RL[\d]+-[A-Z0-9\-]+Z$/.test(Utils.trim(sValue));
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5941,7 +6026,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
 	RL.data().mainLanguage(sLang);
 	this.cancelCommand();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6054,7 +6139,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
 	}, this));
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6143,7 +6228,7 @@ AdminLoginViewModel.prototype.onHide = function ()
 {
 	this.loginFocus(false);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6169,7 +6254,7 @@ AdminMenuViewModel.prototype.link = function (sRoute)
 {
 	return '#/' + sRoute;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6195,7 +6280,7 @@ AdminPaneViewModel.prototype.logoutClick = function ()
 	RL.remote().adminLogout(function () {
 		RL.loginAndLogoutReload();
 	});
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6323,7 +6408,7 @@ AdminGeneral.prototype.phpInfoLink = function ()
 	return RL.link().phpInfo();
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6370,7 +6455,7 @@ AdminLogin.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6441,7 +6526,7 @@ AdminBranding.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6663,7 +6748,7 @@ AdminContacts.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6754,7 +6839,7 @@ AdminDomains.prototype.onDomainListChangeRequest = function ()
 {
 	RL.reloadDomainList();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6869,7 +6954,7 @@ AdminSecurity.prototype.phpInfoLink = function ()
 {
 	return RL.link().phpInfo();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6997,7 +7082,7 @@ AdminSocial.prototype.onBuild = function ()
 
 	}, 50);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7096,7 +7181,7 @@ AdminPlugins.prototype.onPluginDisableRequest = function (sResult, oData)
 
 	RL.reloadPluginList();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7196,7 +7281,7 @@ AdminPackages.prototype.installPackage = function (oPackage)
 		RL.remote().packageInstall(this.requestHelper(oPackage, true), oPackage);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7253,7 +7338,7 @@ AdminLicensing.prototype.licenseExpiredMomentValue = function ()
 	;
 
 	return iTime && 1898625600 === iTime ? 'Never' : (oDate.format('LL') + ' (' + oDate.from(moment()) + ')');
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7330,7 +7415,7 @@ AdminAbout.prototype.updateCoreData = function ()
 		RL.updateCoreData();
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7463,7 +7548,7 @@ AbstractData.prototype.populateDataOnStart = function()
 
 	this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7516,7 +7601,7 @@ _.extend(AdminDataStorage.prototype, AbstractData.prototype);
 AdminDataStorage.prototype.populateDataOnStart = function()
 {
 	AbstractData.prototype.populateDataOnStart.call(this);
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7792,7 +7877,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
 		'Version': sVersion
 	});
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8055,7 +8140,7 @@ AdminAjaxRemoteStorage.prototype.adminPing = function (fCallback)
 {
 	this.defaultRequest(fCallback, 'AdminPing');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8116,7 +8201,7 @@ AbstractCacheStorage.prototype.setServicesData = function (oData)
 {
 	this.oServices = oData;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8129,7 +8214,7 @@ function AdminCacheStorage()
 }
 
 _.extend(AdminCacheStorage.prototype, AbstractCacheStorage.prototype);
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8311,7 +8396,7 @@ AbstractSettings.prototype.routes = function ()
 		['', oRules]
 	];
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8328,7 +8413,7 @@ _.extend(AdminLoginScreen.prototype, KnoinAbstractScreen.prototype);
 AdminLoginScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8348,7 +8433,7 @@ _.extend(AdminSettingsScreen.prototype, AbstractSettings.prototype);
 AdminSettingsScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8708,7 +8793,7 @@ AbstractApp.prototype.bootstart = function ()
 
 	ssm.ready();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -9011,7 +9096,7 @@ AdminApp.prototype.bootstart = function ()
  * @type {AdminApp}
  */
 RL = new AdminApp();
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
@@ -9064,7 +9149,7 @@ window['__RLBOOT'] = function (fCall) {
 		window['__RLBOOT'] = null;
 	});
 };
-
+
 if (window.SimplePace) {
 	window.SimplePace.add(10);
 }

rainloop/v/0.0.0/static/js/app.js

@@ -78,7 +78,7 @@ var
 
 	NotificationClass = window.Notification && window.Notification.requestPermission ? window.Notification : null
 ;
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /*jshint onevar: false*/
@@ -90,7 +90,7 @@ var
 
 	$proxyDiv = $('<div></div>')
 ;
-/*jshint onevar: true*/
+/*jshint onevar: true*/
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -246,7 +246,7 @@ if (Globals.bAllowPdfPreview && navigator && navigator.mimeTypes)
 		return oType && 'application/pdf' === oType.type;
 	});
 }
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 Consts.Defaults = {};
@@ -366,7 +366,7 @@ Consts.DataImages.UserDotPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA
  * @type {string}
  */
 Consts.DataImages.TranspPic = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -797,7 +797,7 @@ Enums.Notification = {
 	'UnknownNotification': 999,
 	'UnknownError': 999
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 Utils.trim = $.trim;
@@ -1239,22 +1239,106 @@ Utils.removeSelection = function ()
  */
 Utils.replySubjectAdd = function (sPrefix, sSubject)
 {
+	sPrefix = Utils.trim(sPrefix.toUpperCase());
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
 	var
-		oMatch = null,
+		iIndex = 0,
-		sResult = Utils.trim(sSubject)
+		sResult = '',
+		bDrop = false,
+		sTrimmedPart = '',
+		aSubject = [],
+		aParts = [],
+		bRe = 'RE' === sPrefix,
+		bFwd = 'FWD' === sPrefix,
+		bPrefixIsRe = !bFwd
 	;
 
-	if (null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]) ||
+	if ('' !== sSubject)
-		null !== (oMatch = (new window.RegExp('^' + sPrefix + '[\\s]?[\\[\\(][\\d]+[\\]\\)][\\s]?\\:(.*)$', 'gi')).exec(sSubject)) && !Utils.isUnd(oMatch[1]))
 	{
-		sResult = sPrefix + ': ' + Utils.trim(oMatch[1]);
+		bDrop = false;
+
+		aParts = sSubject.split(':');
+		for (iIndex = 0; iIndex < aParts.length; iIndex++)
+		{
+			sTrimmedPart = Utils.trim(aParts[iIndex]);
+			if (!bDrop && 
+					(/^(RE|FWD)$/i.test(sTrimmedPart) || /^(RE|FWD)[\[\(][\d]+[\]\)]$/i.test(sTrimmedPart))
+				)
+			{
+				if (!bRe)
+				{
+					bRe = !!(/^RE/i.test(sTrimmedPart));
+				}
+				
+				if (!bFwd)
+				{
+					bFwd = !!(/^FWD/i.test(sTrimmedPart));
+				}
+			}
+			else
+			{
+				aSubject.push(aParts[iIndex]);
+				bDrop = true;
+			}
+		}
+
+		if (0 < aSubject.length)
+		{
+			sResult = Utils.trim(aSubject.join(':'));
+		}
+	}
+
+	if (bPrefixIsRe)
+	{
+		bRe = false;
 	}
 	else
 	{
-		sResult = sPrefix + ': ' + sSubject;
+		bFwd = false;
 	}
 
-	return sResult.replace(/[\s]+/g, ' ');
+	return Utils.trim(
+		(bPrefixIsRe ? 'Re: ' : 'Fwd: ') +
+		(bRe ? 'Re: ' : '') +
+		(bFwd ? 'Fwd: ' : '') +
+		sResult
+	);
+};
+
+
+/**
+ * @param {string} sSubject
+ * @return {string}
+ */
+Utils.fixLongSubject = function (sSubject)
+{
+	var
+		iLimit = 30,
+		mReg = /^Re([\[\(]([\d]+)[\]\)]|):[\s]{0,3}Re([\[\(]([\d]+)[\]\)]|):/ig,
+		oMatch = null
+	;
+
+	sSubject = Utils.trim(sSubject.replace(/[\s]+/, ' '));
+
+	do
+	{
+		iLimit--;
+
+		oMatch = mReg.exec(sSubject);
+		if (!oMatch || Utils.isUnd(oMatch[0]))
+		{
+			oMatch = null;
+		}
+
+		if (oMatch)
+		{
+			sSubject = sSubject.replace(mReg, 'Re:');
+		}
+	}
+	while (oMatch || 0 < iLimit);
+
+	return sSubject.replace(/[\s]+/, ' ');
 };
 
 /**
@@ -1292,10 +1376,11 @@ Utils._replySubjectAdd_ = function (sPrefix, sSubject, bFixLongSubject)
 };
 
 /**
+ * @deprecated
  * @param {string} sSubject
  * @return {string}
  */
-Utils.fixLongSubject = function (sSubject)
+Utils._fixLongSubject_ = function (sSubject)
 {
 	var
 		iCounter = 0,
@@ -2704,7 +2789,7 @@ Utils.detectDropdownVisibility = _.debounce(function () {
 		return oItem.hasClass('open');
 	}));
 }, 50);
-
+
 /*jslint bitwise: true*/
 // Base64 encode / decode
 // http://www.webtoolkit.info/
@@ -2868,7 +2953,7 @@ Base64 = {
 	}
 };
 
-/*jslint bitwise: false*/
+/*jslint bitwise: false*/
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 ko.bindingHandlers.tooltip = {
@@ -3711,7 +3796,7 @@ ko.observable.fn.validateFunc = function (fFunc)
 
 	return this;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4017,7 +4102,7 @@ LinkBuilder.prototype.socialFacebook = function ()
 {
 	return this.sServer + 'SocialFacebook' + ('' !== this.sSpecSuffix ? '/' + this.sSpecSuffix + '/' : '');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -4113,7 +4198,7 @@ Plugins.settingsGet = function (sPluginSection, sName)
 };
 
 
-
+
 
 /**
  * @constructor
@@ -4352,7 +4437,7 @@ NewHtmlEditorWrapper.prototype.clear = function (bFocus)
 	this.setHtml('', bFocus);
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5065,7 +5150,7 @@ Selector.prototype.on = function (sEventName, fCallback)
 {
 	this.oCallbacks[sEventName] = fCallback;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5141,7 +5226,7 @@ CookieDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5214,7 +5299,7 @@ LocalStorageDriver.prototype.get = function (sKey)
 
 	return mResult;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5259,7 +5344,7 @@ LocalStorage.prototype.get = function (iKey)
 {
 	return this.oDriver ? this.oDriver.get('p' + iKey) : null;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5274,7 +5359,7 @@ KnoinAbstractBoot.prototype.bootstart = function ()
 {
 
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5369,7 +5454,7 @@ KnoinAbstractViewModel.prototype.registerPopupKeyDown = function ()
 		return true;
 	});
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5447,7 +5532,7 @@ KnoinAbstractScreen.prototype.__start = function ()
 		this.oCross = oRoute;
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -5863,7 +5948,7 @@ Knoin.prototype.bootstart = function ()
 };
 
 kn = new Knoin();
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6229,7 +6314,7 @@ EmailModel.prototype.inputoTagLine = function ()
 {
 	return 0 < this.name.length ? this.name + ' (' + this.email + ')' : this.email;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6355,7 +6440,7 @@ ContactModel.prototype.lineAsCcc = function ()
 
 	return aResult.join(' ');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6386,7 +6471,7 @@ function ContactPropertyModel(iType, sTypeStr, sValue, bFocused, sPlaceholder)
 	}, this);
 
 }
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6432,7 +6517,7 @@ ContactTagModel.prototype.toLine = function (bEncodeHtml)
 	return (Utils.isUnd(bEncodeHtml) ? false : !!bEncodeHtml) ?
 		Utils.encodeHtml(this.name()) : this.name();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6670,7 +6755,7 @@ AttachmentModel.prototype.iconClass = function ()
 
 	return sClass;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -6733,7 +6818,7 @@ ComposeAttachmentModel.prototype.initByUploadJson = function (oJsonAttachment)
 	}
 
 	return bResult;
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -7959,7 +8044,7 @@ MessageModel.prototype.flagHash = function ()
 	return [this.deleted(), this.unseen(), this.flagged(), this.answered(), this.forwarded(),
 		this.isReadReceipt()].join('');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8293,7 +8378,7 @@ FolderModel.prototype.printableFullName = function ()
 {
 	return this.fullName.split(this.delimiter).join(' / ');
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8316,7 +8401,7 @@ AccountModel.prototype.email = '';
 AccountModel.prototype.changeAccountLink = function ()
 {
 	return RL.link().change(this.email);
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8354,7 +8439,7 @@ IdentityModel.prototype.formattedNameForEmail = function ()
 	var sName = this.name();
 	return '' === sName ? this.email() : '"' + Utils.quoteName(sName) + '" <' + this.email() + '>';
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8404,7 +8489,7 @@ FilterActionModel.prototype.removeSelf = function ()
 	{
 		this.parentList.remove(this);
 	}
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8455,7 +8540,7 @@ FilterConditionModel.prototype.removeSelf = function ()
 		this.parentList.remove(this);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8511,7 +8596,7 @@ FilterModel.prototype.parse = function (oItem)
 
 	return bResult;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8544,7 +8629,7 @@ OpenPgpKeyModel.prototype.user = '';
 OpenPgpKeyModel.prototype.email = '';
 OpenPgpKeyModel.prototype.armor = '';
 OpenPgpKeyModel.prototype.isPrivate = false;
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8642,7 +8727,7 @@ PopupsFolderClearViewModel.prototype.onShow = function (oFolder)
 		this.selectedFolder(oFolder);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8754,7 +8839,7 @@ PopupsFolderCreateViewModel.prototype.onFocus = function ()
 {
 	this.folderName.focused(true);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -8869,7 +8954,7 @@ PopupsFolderSystemViewModel.prototype.onShow = function (iNotificationType)
 	this.notification(sNotification);
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -10376,7 +10461,7 @@ PopupsComposeViewModel.prototype.triggerForResize = function ()
 	this.editorResizeThrottle();
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11120,7 +11205,7 @@ PopupsContactsViewModel.prototype.onHide = function ()
 //		oItem.checked(false);
 //	});
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11258,7 +11343,7 @@ PopupsAdvancedSearchViewModel.prototype.onFocus = function ()
 {
 	this.fromFocus(true);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11354,7 +11439,7 @@ PopupsAddAccountViewModel.prototype.onFocus = function ()
 {
 	this.emailFocus(true);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11445,7 +11530,7 @@ PopupsAddOpenPgpKeyViewModel.prototype.onFocus = function ()
 {
 	this.key.focus(true);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11487,7 +11572,7 @@ PopupsViewOpenPgpKeyViewModel.prototype.onShow = function (oOpenPgpKey)
 		this.key(oOpenPgpKey.armor);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11584,7 +11669,7 @@ PopupsGenerateNewOpenPgpKeyViewModel.prototype.onFocus = function ()
 {
 	this.email.focus(true);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11826,7 +11911,7 @@ PopupsComposeOpenPgpViewModel.prototype.onShow = function (fCallback, sText, sFr
 	this.to(aRec);
 	this.text(sText);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -11976,7 +12061,7 @@ PopupsIdentityViewModel.prototype.onFocus = function ()
 		this.email.focused(true);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12038,7 +12123,7 @@ PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
 	RL.data().mainLanguage(sLang);
 	this.cancelCommand();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12094,7 +12179,7 @@ PopupsTwoFactorTestViewModel.prototype.onFocus = function ()
 {
 	this.code.focused(true);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12207,7 +12292,7 @@ PopupsAskViewModel.prototype.onBuild = function ()
 	}, this));
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12254,7 +12339,7 @@ PopupsKeyboardShortcutsHelpViewModel.prototype.onBuild = function (oDom)
 		}
 	}, this));
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12552,7 +12637,7 @@ LoginViewModel.prototype.selectLanguage = function ()
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12650,7 +12735,7 @@ AbstractSystemDropDownViewModel.prototype.onBuild = function ()
 		}
 	});
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12664,7 +12749,7 @@ function MailBoxSystemDropDownViewModel()
 }
 
 Utils.extendAsViewModel('MailBoxSystemDropDownViewModel', MailBoxSystemDropDownViewModel, AbstractSystemDropDownViewModel);
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12678,7 +12763,7 @@ function SettingsSystemDropDownViewModel()
 }
 
 Utils.extendAsViewModel('SettingsSystemDropDownViewModel', SettingsSystemDropDownViewModel, AbstractSystemDropDownViewModel);
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -12928,7 +13013,7 @@ MailBoxFolderListViewModel.prototype.contactsClick = function ()
 		kn.showScreenPopup(PopupsContactsViewModel);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -13833,7 +13918,7 @@ MailBoxMessageListViewModel.prototype.initUploaderForAppend = function ()
 	;
 
 	return !!oJua;
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14527,7 +14612,7 @@ MailBoxMessageViewViewModel.prototype.readReceipt = function (oMessage)
 		RL.reloadFlagsCurrentMessageListAndMessageFromCache();
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14558,7 +14643,7 @@ SettingsMenuViewModel.prototype.backToMailBoxClick = function ()
 {
 	kn.setHash(RL.link().inbox());
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14591,7 +14676,7 @@ SettingsPaneViewModel.prototype.backToMailBoxClick = function ()
 {
 	kn.setHash(RL.link().inbox());
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14753,7 +14838,7 @@ SettingsGeneral.prototype.selectLanguage = function ()
 {
 	kn.showScreenPopup(PopupsLanguagesViewModel);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14805,7 +14890,7 @@ SettingsContacts.prototype.onBuild = function ()
 //{
 //
 //};
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14888,7 +14973,7 @@ SettingsAccounts.prototype.deleteAccount = function (oAccountToRemove)
 		}
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -14978,7 +15063,7 @@ SettingsIdentity.prototype.onBuild = function ()
 		
 	}, 50);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15197,7 +15282,7 @@ SettingsIdentities.prototype.onBuild = function (oDom)
 		});
 
 	}, 50);
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15234,7 +15319,7 @@ SettingsFilters.prototype.addFilter = function ()
 
 	this.filters.push(oFilter);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15386,7 +15471,7 @@ SettingsSecurity.prototype.onBuild = function ()
 	this.processing(true);
 	RL.remote().getTwoFactor(this.onResult);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15455,7 +15540,7 @@ function SettingsSocialScreen()
 }
 
 Utils.addSettingsViewModel(SettingsSocialScreen, 'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15562,7 +15647,7 @@ SettingsChangePasswordScreen.prototype.onChangePasswordResponse = function (sRes
 			Utils.getNotification(Enums.Notification.CouldNotSaveNewPassword));
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15759,7 +15844,7 @@ SettingsFolders.prototype.unSubscribeFolder = function (oFolder)
 	
 	oFolder.subScribed(false);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15875,7 +15960,7 @@ SettingsThemes.prototype.onBuild = function ()
 		};
 	}));
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -15945,7 +16030,7 @@ SettingsOpenPGP.prototype.deleteOpenPgpKey = function (oOpenPgpKeyToRemove)
 			RL.reloadOpenPgpKeys();
 		}
 	}
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -16078,7 +16163,7 @@ AbstractData.prototype.populateDataOnStart = function()
 
 	this.contactsIsAllowed(!!RL.settingsGet('ContactsIsAllowed'));
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -17335,7 +17420,7 @@ WebMailDataStorage.prototype.findSelfPrivateKey = function (sPassword)
 {
 	return this.findPrivateKeyByEmail(this.accountEmail(), sPassword);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -17611,7 +17696,7 @@ AbstractAjaxRemoteStorage.prototype.jsVersion = function (fCallback, sVersion)
 		'Version': sVersion
 	});
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -18398,7 +18483,7 @@ WebMailAjaxRemoteStorage.prototype.socialUsers = function (fCallback)
 	this.defaultRequest(fCallback, 'SocialUsers');
 };
 
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -18459,7 +18544,7 @@ AbstractCacheStorage.prototype.setServicesData = function (oData)
 {
 	this.oServices = oData;
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -18779,7 +18864,7 @@ WebMailCacheStorage.prototype.storeMessageFlagsToCacheByFolderAndUid = function
 		this.setMessageFlagsToCache(sFolder, sUid, aFlags);
 	}
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -18961,7 +19046,7 @@ AbstractSettings.prototype.routes = function ()
 		['', oRules]
 	];
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -18978,7 +19063,7 @@ _.extend(LoginScreen.prototype, KnoinAbstractScreen.prototype);
 LoginScreen.prototype.onShow = function ()
 {
 	RL.setTitle('');
-};
+};
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -19151,7 +19236,7 @@ MailBoxScreen.prototype.routes = function ()
 		[/^([^\/]*)$/,  {'normalize_': fNormS}]
 	];
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -19180,7 +19265,7 @@ SettingsScreen.prototype.onShow = function ()
 	RL.setTitle(this.sSettingsTitle);
 	RL.data().keyScope(Enums.KeyState.Settings);
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -19540,7 +19625,7 @@ AbstractApp.prototype.bootstart = function ()
 
 	ssm.ready();
 };
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 /**
@@ -20837,7 +20922,7 @@ RainLoopApp.prototype.bootstart = function ()
  * @type {RainLoopApp}
  */
 RL = new RainLoopApp();
-
+
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
 $html.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile');
@@ -20890,7 +20975,7 @@ window['__RLBOOT'] = function (fCall) {
 		window['__RLBOOT'] = null;
 	});
 };
-
+
 if (window.SimplePace) {
 	window.SimplePace.add(10);
 }