diff --git a/build/langs.php b/build/langs.php
index 5c12dd192..dc875fd32 100644
--- a/build/langs.php
+++ b/build/langs.php
@@ -33,7 +33,7 @@ function mergeLangStructure($aFromLang, $aEngLang, &$iCount = 0)
 function saveLangStructure($sLangFile, $aLang)
 {
 	$aResultLines = array();
-	$aResultLines[] = '; '.$sLangFile;
+//	$aResultLines[] = '; '.$sLangFile;
 
 	foreach ($aLang as $sSectionKey => $aSectionValue)
 	{
@@ -62,7 +62,7 @@ foreach ($aFiles as $sFile)
 	$aNextLang = \getLangStructure($sFileName);
 	$aNewLang = \mergeLangStructure($aNextLang, $aEngLang, $iCount);
 
-	if (\json_encode($aNextLang) === \json_encode($aNewLang))
+	if (0 === $iCount)
 	{
 		echo $sFileName.': ok'.$sNL;
 	}
diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js
index e61cfa545..0c94b847f 100644
--- a/dev/Common/Enums.js
+++ b/dev/Common/Enums.js
@@ -399,6 +399,9 @@
 		'CantSendMessage': 302,
 		'InvalidRecipients': 303,
 
+		'CantSaveFilters': 351,
+		'FiltersAreNotCorrect': 352,
+
 		'CantCreateFolder': 400,
 		'CantRenameFolder': 401,
 		'CantDeleteFolder': 402,
diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index c65f2da16..cc355cfe8 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -700,6 +700,9 @@
 		oN[Enums.Notification.CantSendMessage] = Utils.i18n('NOTIFICATIONS/CANT_SEND_MESSAGE');
 		oN[Enums.Notification.InvalidRecipients] = Utils.i18n('NOTIFICATIONS/INVALID_RECIPIENTS');
 
+		oN[Enums.Notification.CantSaveFilters] = Utils.i18n('NOTIFICATIONS/CANT_SAVE_FILTERS');
+		oN[Enums.Notification.FiltersAreNotCorrect] = Utils.i18n('NOTIFICATIONS/FILTERS_ARE_NOT_CORRECT');
+
 		oN[Enums.Notification.CantCreateFolder] = Utils.i18n('NOTIFICATIONS/CANT_CREATE_FOLDER');
 		oN[Enums.Notification.CantRenameFolder] = Utils.i18n('NOTIFICATIONS/CANT_RENAME_FOLDER');
 		oN[Enums.Notification.CantDeleteFolder] = Utils.i18n('NOTIFICATIONS/CANT_DELETE_FOLDER');
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index da3cc0c76..455eb20db 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -139,6 +139,9 @@
 			ViewModelClass.__builded = true;
 			ViewModelClass.__vm = oViewModel;
 
+			oViewModel.onShowTrigger = ko.observable(false);
+			oViewModel.onHideTrigger = ko.observable(false);
+
 			oViewModel.viewModelName = ViewModelClass.__name;
 			oViewModel.viewModelNames = ViewModelClass.__names;
 
@@ -172,6 +175,11 @@
 						else
 						{
 							Utils.delegateRun(this, 'onHide');
+							if (this.onHideTrigger)
+							{
+								this.onHideTrigger(!this.onHideTrigger());
+							}
+
 							this.restoreKeyScope();
 
 							_.each(this.viewModelNames, function (sName) {
@@ -244,6 +252,10 @@
 			{
 				ViewModelClassToShow.__vm.modalVisibility(true);
 				Utils.delegateRun(ViewModelClassToShow.__vm, 'onShow', aParameters || []);
+				if (ViewModelClassToShow.__vm.onShowTrigger)
+				{
+					ViewModelClassToShow.__vm.onShowTrigger(!ViewModelClassToShow.__vm.onShowTrigger());
+				}
 
 				_.each(ViewModelClassToShow.__names, function (sName) {
 					Plugins.runHook('view-model-on-show', [sName, ViewModelClassToShow.__vm, aParameters || []]);
@@ -314,6 +326,11 @@
 					{
 						Utils.delegateRun(self.oCurrentScreen, 'onHide');
 
+						if (self.oCurrentScreen.onHideTrigger)
+						{
+							self.oCurrentScreen.onHideTrigger(!self.oCurrentScreen.onHideTrigger());
+						}
+
 						if (Utils.isNonEmptyArray(self.oCurrentScreen.viewModels()))
 						{
 							_.each(self.oCurrentScreen.viewModels(), function (ViewModelClass) {
@@ -324,6 +341,11 @@
 									ViewModelClass.__dom.hide();
 									ViewModelClass.__vm.viewModelVisibility(false);
 									Utils.delegateRun(ViewModelClass.__vm, 'onHide');
+
+									if (ViewModelClass.__vm.onHideTrigger)
+									{
+										ViewModelClass.__vm.onHideTrigger(!ViewModelClass.__vm.onHideTrigger());
+									}
 								}
 
 							});
@@ -337,6 +359,10 @@
 					if (self.oCurrentScreen)
 					{
 						Utils.delegateRun(self.oCurrentScreen, 'onShow');
+						if (self.oCurrentScreen.onShowTrigger)
+						{
+							self.oCurrentScreen.onShowTrigger(!self.oCurrentScreen.onShowTrigger());
+						}
 
 						Plugins.runHook('screen-on-show', [self.oCurrentScreen.screenName(), self.oCurrentScreen]);
 
@@ -351,6 +377,11 @@
 									ViewModelClass.__vm.viewModelVisibility(true);
 
 									Utils.delegateRun(ViewModelClass.__vm, 'onShow');
+									if (ViewModelClass.__vm.onShowTrigger)
+									{
+										ViewModelClass.__vm.onShowTrigger(!ViewModelClass.__vm.onShowTrigger());
+									}
+
 									Utils.delegateRun(ViewModelClass.__vm, 'onFocus', [], 200);
 
 									_.each(ViewModelClass.__names, function (sName) {
diff --git a/dev/Model/Filter.js b/dev/Model/Filter.js
index cb112d2c9..5a13a9f82 100644
--- a/dev/Model/Filter.js
+++ b/dev/Model/Filter.js
@@ -71,19 +71,23 @@
 			switch (this.actionType())
 			{
 				case Enums.FiltersAction.MoveTo:
-					sResult = 'MoveTo $i18n "' + fGetRealFolderName(sActionValue) + '"';
+					sResult = Utils.i18n('SETTINGS_FILTERS/SUBNAME_MOVE_TO', {
+						'FOLDER': fGetRealFolderName(sActionValue)
+					});
 					break;
 				case Enums.FiltersAction.Forward:
-					sResult = 'Forward @i18n "' + sActionValue + '"';
+					sResult = Utils.i18n('SETTINGS_FILTERS/SUBNAME_FORWARD_TO', {
+						'EMAIL': sActionValue
+					});
 					break;
 				case Enums.FiltersAction.Vacation:
-					sResult = 'Vacation message @i18n';
+					sResult = Utils.i18n('SETTINGS_FILTERS/SUBNAME_VACATION_MESSAGE');
 					break;
 				case Enums.FiltersAction.Reject:
-					sResult = 'Reject @i18n';
+					sResult = Utils.i18n('SETTINGS_FILTERS/SUBNAME_REJECT');
 					break;
 				case Enums.FiltersAction.Discard:
-					sResult = 'Discard @i18n';
+					sResult = Utils.i18n('SETTINGS_FILTERS/SUBNAME_DISCARD');
 					break;
 			}
 
diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js
index e79cdbef2..fdab0676c 100644
--- a/dev/Settings/User/Filters.js
+++ b/dev/Settings/User/Filters.js
@@ -25,6 +25,8 @@
 		this.haveChanges = ko.observable(false);
 
 		this.processText = ko.observable('');
+		this.saveErrorText = ko.observable('');
+
 		this.visibility = ko.observable(false);
 
 		this.modules = Data.filterModules;
@@ -39,6 +41,7 @@
 		this.filterRaw.capa = ko.observable('');
 		this.filterRaw.active = ko.observable(false);
 		this.filterRaw.allow = ko.observable(false);
+		this.filterRaw.error = ko.observable(false);
 
 		this.processText = ko.computed(function () {
 			return this.filters.loading() ? Utils.i18n('SETTINGS_FILTERS/LOADING_PROCESS') : '';
@@ -55,7 +58,14 @@
 
 			if (!this.filters.saving())
 			{
+				if ('' === Utils.trim(this.filterRaw()))
+				{
+					this.filterRaw.error(true);
+					return false;
+				}
+
 				this.filters.saving(true);
+				this.saveErrorText('');
 
 				Remote.filtersSave(function (sResult, oData) {
 
@@ -66,6 +76,11 @@
 						self.haveChanges(false);
 						self.updateList();
 					}
+					else
+					{
+						self.saveErrorText(oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) :
+							Utils.getNotification(Enums.Notification.CantSaveFilters));
+					}
 
 				}, this.filters(), this.filterRaw(), this.filterRaw.active());
 			}
@@ -82,10 +97,12 @@
 
 		this.filterRaw.subscribe(function () {
 			this.haveChanges(true);
+			this.filterRaw.error(false);
 		}, this);
 
 		this.filterRaw.active.subscribe(function () {
 			this.haveChanges(true);
+			this.filterRaw.error(false);
 		}, this);
 	}
 
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index d5da8ad6b..17d320aec 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -226,4 +226,8 @@ html.cssanimations {
 @keyframes bouncedelay {
   0%, 80%, 100% { transform: scale(0.0); }
   40% { transform: scale(1.0); }
+}
+
+.command.command-disabled.hide-on-disabled-command {
+	display:none;
 }
\ No newline at end of file
diff --git a/dev/View/Popup/Filter.js b/dev/View/Popup/Filter.js
index 5c079c476..17cf9a826 100644
--- a/dev/View/Popup/Filter.js
+++ b/dev/View/Popup/Filter.js
@@ -77,7 +77,7 @@
 
 		this.populateOptions();
 
-		this.modules.subscribe(this.populateOptions, this)
+		this.modules.subscribe(this.populateOptions, this);
 
 		kn.constructorEnd(this);
 	}
@@ -87,8 +87,9 @@
 
 	FilterPopupView.prototype.populateOptions = function ()
 	{
-		this.actionTypeOptions = []
-//		this.actionTypeOptions.push({'id': Enums.FiltersAction.None, 'name': 'None @i18n'});
+		this.actionTypeOptions = [];
+//		this.actionTypeOptions.push({'id': Enums.FiltersAction.None,
+//			'name': Utils.i18n('POPUPS_FILTER/SELECT_ACTION_NONE')});
 
 		var oModules = this.modules();
 		if (oModules)
@@ -100,38 +101,44 @@
 
 			if (oModules.moveto)
 			{
-				this.actionTypeOptions.push({'id': Enums.FiltersAction.MoveTo, 'name': 'Move to @i18n'});
+				this.actionTypeOptions.push({'id': Enums.FiltersAction.MoveTo,
+					'name': Utils.i18n('POPUPS_FILTER/SELECT_ACTION_MOVE_TO')});
 			}
 
 			if (oModules.redirect)
 			{
-				this.actionTypeOptions.push({'id': Enums.FiltersAction.Forward, 'name': 'Forward to @i18n'});
+				this.actionTypeOptions.push({'id': Enums.FiltersAction.Forward,
+					'name': Utils.i18n('POPUPS_FILTER/SELECT_ACTION_FORWARD_TO')});
 			}
 
 			if (oModules.reject)
 			{
-				this.actionTypeOptions.push({'id': Enums.FiltersAction.Reject, 'name': 'Reject @i18n'});
+				this.actionTypeOptions.push({'id': Enums.FiltersAction.Reject,
+					'name': Utils.i18n('POPUPS_FILTER/SELECT_ACTION_REJECT')});
 			}
 
 			if (oModules.vacation)
 			{
-				this.actionTypeOptions.push({'id': Enums.FiltersAction.Vacation, 'name': 'Vacation message @i18n'});
+				this.actionTypeOptions.push({'id': Enums.FiltersAction.Vacation,
+					'name': Utils.i18n('POPUPS_FILTER/SELECT_ACTION_VACATION_MESSAGE')});
+
 			}
 		}
 
-		this.actionTypeOptions.push({'id': Enums.FiltersAction.Discard, 'name': 'Discard @i18n'});
+		this.actionTypeOptions.push({'id': Enums.FiltersAction.Discard,
+			'name': Utils.i18n('POPUPS_FILTER/SELECT_ACTION_DISCARD')});
 
 		this.fieldOptions = [
-			{'id': Enums.FilterConditionField.From, 'name': 'From @i18n'},
-			{'id': Enums.FilterConditionField.Recipient, 'name': 'Recipient (To or CC) @i18n'},
-			{'id': Enums.FilterConditionField.Subject, 'name': 'Subject @i18n'}
+			{'id': Enums.FilterConditionField.From, 'name': Utils.i18n('POPUPS_FILTER/SELECT_FIELD_FROM')},
+			{'id': Enums.FilterConditionField.Recipient, 'name': Utils.i18n('POPUPS_FILTER/SELECT_FIELD_RECIPIENTS')},
+			{'id': Enums.FilterConditionField.Subject, 'name': Utils.i18n('POPUPS_FILTER/SELECT_FIELD_SUBJECT')}
 		];
 
 		this.typeOptions = [
-			{'id': Enums.FilterConditionType.Contains, 'name': 'Contains @i18n'},
-			{'id': Enums.FilterConditionType.NotContains, 'name': 'Not Contains @i18n'},
-			{'id': Enums.FilterConditionType.EqualTo, 'name': 'Equal To @i18n'},
-			{'id': Enums.FilterConditionType.NotEqualTo, 'name': 'Not Equal To @i18n'}
+			{'id': Enums.FilterConditionType.Contains, 'name': Utils.i18n('POPUPS_FILTER/SELECT_TYPE_CONTAINS')},
+			{'id': Enums.FilterConditionType.NotContains, 'name': Utils.i18n('POPUPS_FILTER/SELECT_TYPE_NOT_CONTAINS')},
+			{'id': Enums.FilterConditionType.EqualTo, 'name': Utils.i18n('POPUPS_FILTER/SELECT_TYPE_EQUAL_TO')},
+			{'id': Enums.FilterConditionType.NotEqualTo, 'name': Utils.i18n('POPUPS_FILTER/SELECT_TYPE_NOT_EQUAL_TO')}
 		];
 	};
 
diff --git a/package.json b/package.json
index 49392e081..69de5a2d5 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
-	"version": "1.7.2",
-	"release": "229",
+	"version": "1.7.3",
+	"release": "235",
 	"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/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 7761e2fd4..215c34a70 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1025,7 +1025,7 @@ class Actions
 	 */
 	private function UseSieve()
 	{
-		return false; // TODO
+		return $this->Config()->Get('capa', 'filters', false);
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 2a03ba565..b38369d40 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -128,6 +128,10 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'capath'			=> array('', 'capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)'),
 			),
 
+			'capa' => array(
+				'filters' => array(true)
+			),
+
 			'login' => array(
 
 				'default_domain' => array('', ''),
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Notifications.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Notifications.php
index 1358f7cd7..15750c9b3 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Notifications.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Notifications.php
@@ -36,6 +36,9 @@ class Notifications
 	const CantSendMessage = 302;
 	const InvalidRecipients = 303;
 
+	const CantSaveFilters = 351;
+	const FiltersAreNotCorrect = 352;
+
 	const CantCreateFolder = 400;
 	const CantRenameFolder = 401;
 	const CantDeleteFolder = 402;
@@ -107,6 +110,9 @@ class Notifications
 			self::CantSaveMessage => 'CantSaveMessage',
 			self::CantSendMessage => 'CantSendMessage',
 			self::InvalidRecipients => 'InvalidRecipients',
+			self::CantSaveFilters => 'CantSaveFilters',
+			self::FiltersAreNotCorrect => 'FiltersAreNotCorrect',
+
 			self::CantCreateFolder => 'CantCreateFolder',
 			self::CantRenameFolder => 'CantRenameFolder',
 			self::CantDeleteFolder => 'CantDeleteFolder',
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
index 589058c95..36c247511 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
@@ -38,8 +38,21 @@ class Filters extends \RainLoop\Providers\AbstractProvider
 	 */
 	public function Save($oAccount, $aFilters, $sRaw = '', $bRawIsActive = false)
 	{
-		return $this->IsActive() ? $this->oDriver->Save($oAccount,
-			$aFilters, $sRaw, $bRawIsActive) : false;
+		try
+		{
+			return $this->IsActive() ? $this->oDriver->Save(
+				$oAccount, $aFilters, $sRaw, $bRawIsActive) : false;
+		}
+		catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
+		{
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ConnectionError, $oException);
+		}
+		catch (\Exception $oException)
+		{
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSaveFilters, $oException);
+		}
+
+		return false;
 	}
 
 	/**
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 08f44a3ec..86468079b 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -84,7 +84,7 @@
 									<div data-bind="component: {
 										name: 'Checkbox',
 										params: {
-											label: 'Use Sieve for this domain',
+											label: 'Allow sieve scripts',
 											value: useSieve
 										}
 									}"></div>
@@ -97,7 +97,7 @@
 										<div data-bind="component: {
 											name: 'Checkbox',
 											params: {
-												label: 'Allow custom raw script',
+												label: 'Allow custom user script',
 												value: sieveAllowRaw
 											}
 										}"></div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index aac776f16..8b45238da 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -4,58 +4,50 @@
 			<div class="modal-header">
 				<button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
 				<h3>
-					<span class="i18n" data-i18n-text="SETTINGS_FILTERS/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
-					<span class="i18n" data-i18n-text="SETTINGS_FILTERS/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
+					<span class="i18n" data-i18n-text="POPUPS_FILTER/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
+					<span class="i18n" data-i18n-text="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
 				</h3>
 			</div>
 			<div class="modal-body">
-				<div class="row filter" data-bind="with: filter">
-					<div class="span9">
+				<div class="row filter" data-bind="with: filter, i18nInit: filter">
+					<div class="span9" data-bind="i18nInit: true">
 
 						<div class="control-group" data-bind="css: {'error': name.error}">
 							<div class="controls">
-								<input type="text" class="span5" data-bind="value: name,  hasFocus: name.focused" placeholder="Name @i18n"
-									autocorrect="off" autocapitalize="off" spellcheck="false" />
+								<input type="text" class="i18n span5" data-bind="value: name,  hasFocus: name.focused"
+									placeholder="" autocorrect="off" autocapitalize="off" spellcheck="false"
+									data-i18n-placeholder="POPUPS_FILTER/FILTER_NAME"
+								/>
 							</div>
 						</div>
 
-						<div class="legend">
-							<span>
-								Conditions @i18n
-							</span>
-						</div>
+						<div class="legend i18n" data-i18n-text="POPUPS_FILTER/LEGEND_CONDIFIONS"></div>
 						<div>
 							<div data-bind="visible: 1 < conditions().length">
 								<select class="span4" data-bind="value: conditionsType">
-									<option value="Any">
-										Matching any of the following rules @i18n
-									</option>
-									<option value="All">
-										Matching all of the following rules @i18n
-									</option>
+									<option value="Any" class="i18n"
+										data-i18n-text="POPUPS_FILTER/SELECT_MATCH_ANY"></option>
+									<option value="All" class="i18n"
+										data-i18n-text="POPUPS_FILTER/SELECT_MATCH_ALL"></option>
 								</select>
 							</div>
 							<div data-bind="visible: 0 < conditions().length, foreach: conditions">
 								<div data-bind="template: {'name': template(), 'data': $data}"></div>
 							</div>
 							<div data-bind="visible: 0 === conditions().length">
-								All incoming messages @i18n
+								<span class="i18n" data-i18n-text="POPUPS_FILTER/ALL_INCOMING_MESSAGES_DESC"></span>
 							</div>
 							<br />
 							<a class="btn" data-bind="click: addCondition, i18nInit: true">
 								<i class="icon-plus"></i>
 								&nbsp;&nbsp;
-								<span class="i18n" data-i18n-text="SETTINGS_FILTERS/BUTTON_ADD_CONDITION"></span>
+								<span class="i18n" data-i18n-text="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
 							</a>
 						</div>
 						<br />
-						<div class="legend">
-							<span>
-								Actions @i18n
-							</span>
-						</div>
-						<select data-bind="options: $root.actionTypeOptions, value: actionType, optionsText: 'name', optionsValue: 'id'"></select>
-						<div data-bind="template: {'name': actionTemplate()}"></div>
+						<div class="legend i18n" data-i18n-text="POPUPS_FILTER/LEGEND_ACTIONS"></div>
+						<select class="span3" data-bind="options: $root.actionTypeOptions, value: actionType, optionsText: 'name', optionsValue: 'id'"></select>
+						<div data-bind="template: {'name': actionTemplate()}, i18nUpdate: actionTemplate"></div>
 					</div>
 				</div>
 			</div>
@@ -63,7 +55,7 @@
 				<a class="btn buttonSave" data-bind="command: saveFilter">
 					<i class="icon-ok"></i>
 					&nbsp;&nbsp;
-					<span class="i18n" data-i18n-text="SETTINGS_FILTERS/BUTTON_DONE"></span>
+					<span class="i18n" data-i18n-text="POPUPS_FILTER/BUTTON_DONE"></span>
 				</a>
 			</div>
 		</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index 9151f38fb..227437418 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -13,15 +13,17 @@
 			</a>
 			&nbsp;&nbsp;
 			<a class="btn" data-bind="visible: filterRaw.allow, click: function () { filterRaw.active(!filterRaw.active()) },
-				css: {'active': filterRaw.active }">
+				css: {'active': filterRaw.active }, tooltip: 'SETTINGS_FILTERS/BUTTON_RAW_SCRIPT'">
 				<i class="icon-file-code"></i>
 			</a>
 			&nbsp;&nbsp;
-			<a class="btn" data-bind="command: saveChanges">
+			<a class="btn hide-on-disabled-command" data-bind="command: saveChanges">
 				<i data-bind="css: {'icon-floppy': !filters.saving(), 'icon-spinner animated': filters.saving()}"></i>
 				&nbsp;&nbsp;
 				<span class="i18n" data-i18n-text="SETTINGS_FILTERS/BUTTON_SAVE"></span>
 			</a>
+			&nbsp;&nbsp;&nbsp;&nbsp;
+			<span data-bind="text: saveErrorText"style="color:red"></span>
 		</div>
 	</div>
 	<div class="row" data-bind="visible: haveChanges">
@@ -30,7 +32,7 @@
 			<div class="alert g-ui-user-select-none" style="margin-bottom: 0">
 				<i class="icon-warning"></i>
 				&nbsp;&nbsp;
-				These changes need to be saved to the server. @i18n
+				<span class="i18n" data-i18n-text="SETTINGS_FILTERS/CHACHES_NEED_TO_BE_SAVED_DESC"></span>
 			</div>
 		</div>
 	</div>
@@ -41,8 +43,15 @@
 				&nbsp;&nbsp;
 				<span data-bind="text: processText"></span>
 			</div>
-			<div data-bind="visible: filterRaw.allow() && filterRaw.active()">
-				<textarea class="span8" style="height: 300px" data-bind="value: filterRaw, valueUpdate: 'afterkeydown'"></textarea>
+			<div class="control-group" data-bind="css: {'error': filterRaw.error}, visible: filterRaw.allow() && filterRaw.active()">
+				<div class="controls">
+					<pre style="word-break: break-word;" data-bind="visible: '' !== filterRaw.capa()">
+						<b class="i18n" data-i18n-text="SETTINGS_FILTERS/CAPABILITY_LABEL"></b>:
+						<span data-bind="text: filterRaw.capa"></span>
+					</pre>
+					<textarea class="span8" style="height: 300px; font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;"
+						data-bind="value: filterRaw, valueUpdate: 'afterkeydown'"></textarea>
+				</div>
 			</div>
 			<table class="table table-hover list-table g-ui-user-select-none"
 				data-bind="visible: !filterRaw.active() || !filterRaw.active(), i18nUpdate: filters">
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
index 776bb9b12..b34f04365 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
@@ -1,6 +1,7 @@
 <div class="control-group" data-bind="css: {'error': actionValue.error}">
 	<div class="controls">
-		<input type="text" data-bind="value: actionValue" placeholder="Email @i18n" />
+		<input type="text" class="span3 i18n" data-bind="value: actionValue" placeholder=""
+			data-i18n-placeholder="POPUPS_FILTER/EMAIL_LABEL" />
 	</div>
 </div>
 <div class="control-group">
@@ -8,14 +9,14 @@
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
-				label: 'keep in INBOX @i18n',
+				label: 'POPUPS_FILTER/KEEP_LABEL',
 				value: actionKeep
 			}
 		}"></div>
 		<div data-bind="visible: $root.allowMarkAsRead, component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Mark as read @i18n',
+				label: 'POPUPS_FILTER/MARK_AS_READ_LABEL',
 				value: actionMarkAsRead
 			}
 		}"></div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
index 69131392f..0f32a1af7 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
@@ -1,6 +1,6 @@
 <div class="control-group" data-bind="css: {'error': actionValue.error}">
 	<div class="controls">
-		<select data-bind="options: $root.folderSelectList, value: $root.selectedFolderValue,
+		<select class="span3" data-bind="options: $root.folderSelectList, value: $root.selectedFolderValue,
 			optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defautOptionsAfterRender"></select>
 	</div>
 </div>
@@ -9,7 +9,7 @@
 		<div data-bind="visible: $root.allowMarkAsRead, component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Mark as read @i18n',
+				label: 'POPUPS_FILTER/MARK_AS_READ_LABEL',
 				value: actionMarkAsRead
 			}
 		}"></div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
index 7d692eb8c..3366660b1 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
@@ -1,5 +1,6 @@
 <div class="control-group" data-bind="css: {'error': actionValue.error}" style="margin-bottom: 0">
 	<div class="controls">
-		<textarea class="span5" data-bind="value: actionValue" style="height: 100px;" placeholder="Reject message @i18n"></textarea>
+		<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
+			placeholder="" data-i18n-placeholder="POPUPS_FILTER/REJECT_MESSAGE_LABEL"></textarea>
 	</div>
 </div>
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
index 976d889bf..a1fca1452 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
@@ -1,10 +1,12 @@
 <div class="control-group" style="margin-bottom: 0">
 	<div class="controls">
-		<input type="text" class="span5" data-bind="value: actionValueSecond" placeholder="Subject (optional) @i18n" />
+		<input type="text" class="span5 i18n" data-bind="value: actionValueSecond" placeholder=""
+			data-i18n-placeholder="POPUPS_FILTER/VACATION_SUBJECT_LABEL" />
 	</div>
 </div>
 <div class="control-group" data-bind="css: {'error': actionValue.error}" style="margin-bottom: 0">
 	<div class="controls">
-		<textarea class="span5" data-bind="value: actionValue" style="height: 100px;" placeholder="Message @i18n"></textarea>
+		<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
+			placeholder="" data-i18n-placeholder="POPUPS_FILTER/VACATION_MESSAGE_LABEL"></textarea>
 	</div>
 </div>
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini
index 8c24d887b..fc5a3614c 100644
--- a/rainloop/v/0.0.0/langs/bg.ini
+++ b/rainloop/v/0.0.0/langs/bg.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Акаунт"
 LABEL_LOGIN = "Логин"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "Имейл"
 LABEL_PHONE = "Телефон"
 LABEL_WEB = "Страница"
 LABEL_BIRTHDAY = "Рожден ден"
-LABEL_TAGS = "Етикети"
 LINK_ADD_EMAIL = "Добави имейл адрес"
 LINK_ADD_PHONE = "Добави телефон"
 LINK_BIRTHDAY = "Рожден ден"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "Двустъпков тест за удостоверяван
 LABEL_CODE = "Код"
 BUTTON_TEST = "Тест"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Избери системни папки"
 SELECT_CHOOSE_ONE = "Избери един"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Кошче"
 LABEL_ARCHIVE = "Архив"
 BUTTON_CANCEL = "Отказ"
 BUTTON_CLOSE = "Затвори"
-
 NOTIFICATION_SENT = "Не сте избрали системна папка, в която изпратените съобщения \"Изпратени\" да бъдат съхранявани след изпращането им.
 Ако нежелаете да запазвате изпратено съобщение, моля, изберете опцията \"Не използвай\"."
-
 NOTIFICATION_DRAFTS = "Не сте избрали системна папка, в която съобщенията \"Чернови\" да бъдат съхранявани по време на съставянето на имейл."
-
 NOTIFICATION_SPAM = "Не сте избрали системна папка, в която съобщенията \"Спам\" да бъдат поставяни.
 Ако желаете да премахнете съобщенията окончателно, моля, изберете опцята \"Не използвай\"."
-
 NOTIFICATION_TRASH = "Не сте избрали системна папка, в която изтритите съобщения \"Отпадък\" да бъдат поставяни.
 Ако желаете да премахнете съобщенията окончателно, моля изберете опцията \"Не използвай\"."
-
 NOTIFICATION_ARCHIVE = "Не сте избрали истемна папка, в която архивираните съобщения \"Архив\" да бъдат поставяни."
 
 [TITLES]
@@ -370,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Парола"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Назад"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Идентичност"
 LABEL_DISPLAY_NAME = "Име"
@@ -521,7 +570,6 @@ LABEL_REPLY_ALL = "Отговори до всички"
 LABEL_FORWARD = "Препрати"
 LABEL_FORWARD_MULTIPLY = "Препрати като прикачен файл"
 LABEL_HELP = "Помощ"
-
 LABEL_CHECK_ALL = "Провери всички съобщения"
 LABEL_ARCHIVE = "Архивирай"
 LABEL_DELETE = "Изтрий"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Цял екран (Изглед за преглед)"
 LABEL_VIEW_MESSAGE_ENTER = "Преглед на съобщението (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Превключи фокуса върху избраното съобщение"
 LABEL_SWITCH_TO_FOLDER_LIST = "Превключи фокуса върху списъка с папки"
-
 LABEL_FULLSCREEN_TOGGLE = "Превключи на режим на цял екран"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Принтиране"
 LABEL_EXIT_FULLSCREEN = "Излез от режим на цял екран"
 LABEL_CLOSE_MESSAGE = "Затвори съобщението (Няма изглед за преглед)"
 LABEL_SWITCH_TO_LIST = "Превключи фокуса обратно към списъка със съобщения"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Запази съобщението"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Can't move message"
 CANT_SAVE_MESSAGE = "Can't save message"
 CANT_SEND_MESSAGE = "Can't send message"
 INVALID_RECIPIENTS = "Invalid recipients"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Can't create folder"
 CANT_RENAME_FOLDER = "Can't rename folder"
 CANT_DELETE_FOLDER = "Can't delete folder"
@@ -614,15 +662,12 @@ BACK_LINK = "Презареди"
 DOMAIN_LIST_DESC = "List of domains webmail is allowed to access."
 PHP_EXSTENSIONS_ERROR_DESC = "Required PHP extension are not available in your PHP configuration!"
 PHP_VERSION_ERROR_DESC = "Your PHP version (%VERSION%) is lower than the minimal required 5.3.0!"
-
 NO_SCRIPT_TITLE = "За това приложение е необходим JavaScript."
 NO_SCRIPT_DESC = "Поддръжката на JavaScript не е налична във вашия браузър.
 Моля, разрешете поддръжката на JavaScript в настройките на вашия браузър и опитайте отново."
-
 NO_COOKIE_TITLE = "За това приложение е необходимо да се поддъжат Бисквитки."
 NO_COOKIE_DESC = "Поддръжката на Бисквитки не е налична във вашия браузър.
 Моля, разрешете поддръжката на Бисквитки в настройките на вашия браузър и опитайте отново."
-
 BAD_BROWSER_TITLE = "Вашият браузър е остарял."
 BAD_BROWSER_DESC = "За да използвате всички функции на приложението,
-изтеглете и инсталирайте един от тези браузъри:"
+изтеглете и инсталирайте един от тези браузъри:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini
index 4ef3c72eb..46a41663b 100644
--- a/rainloop/v/0.0.0/langs/de.ini
+++ b/rainloop/v/0.0.0/langs/de.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-Mail"
 LABEL_LOGIN = "Login"
@@ -234,8 +235,7 @@ BUTTON_OPEN_PGP = "OpenPGP (Plain Text Only)"
 [POPUPS_ASK]
 BUTTON_YES = "Ja"
 BUTTON_NO = "Nein"
-DESC_WANT_CLOSE_THIS_WINDOW = "
-Sind Sie sicher, dass Sie dieses Fenster schließen möchten?"
+DESC_WANT_CLOSE_THIS_WINDOW = "Sind Sie sicher, dass Sie dieses Fenster schließen möchten?"
 DESC_WANT_DELETE_MESSAGES = "Sind Sie sicher, dass Sie diese Nachricht(en) löschen möchten?"
 
 [POPUPS_LANGUAGES]
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "Zwei-Faktor-Autehntifizierung"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Testen"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Wählen Sie den System-Ordner aus"
 SELECT_CHOOSE_ONE = "Wählen Sie einen aus"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Papierkorb"
 LABEL_ARCHIVE = "Archiv"
 BUTTON_CANCEL = "Abbrechen"
 BUTTON_CLOSE = "Schließen"
-
 NOTIFICATION_SENT = "Sie haben keinen \"Gesendet\" System-Ordner gewählt, in dem Nachrichten nach dem Versenden gespeichert werden.
 Falls Sie versandte Nachrichten nicht speichern möchten, wählen Sie die Option \"Nicht anwenden\"."
-
 NOTIFICATION_DRAFTS = "Sie haben keinen \"Entwürfe\" System-Ordner, in dem Nachrichten beim Erstellen gespeichert werden, gewählt."
-
 NOTIFICATION_SPAM = "Sie haben keinen \"Spam\" System-Ordner gewählt, in dem die Spam-Nachrichten landen.
 Falls Sie diese Nachrichten endgültig löschen möchten, wählen Sie die Option \"Nicht anwenden\"."
-
 NOTIFICATION_TRASH = "Sie haben keinen  \"Papierkorb\" System-Ordner gewählt, in dem die gelöschten Nachrichten abgelegt werden.
 Falls Sie gelöschte Nachrichten endgültig löschen möchten, wählen Sie die Option \"Nicht anwenden\"."
-
 NOTIFICATION_ARCHIVE = "Sie haben keinen \"Archiv\" System-Ordner gewählt, in dem die archivierten Nachrichten landen."
 
 [TITLES]
@@ -370,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Passwort"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Zurück"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identität"
 LABEL_DISPLAY_NAME = "Name"
@@ -521,7 +570,6 @@ LABEL_REPLY_ALL = "Allen Antworten"
 LABEL_FORWARD = "Weiterleiten"
 LABEL_FORWARD_MULTIPLY = "Weiterleiten (mehrfach)"
 LABEL_HELP = "Hilfe"
-
 LABEL_CHECK_ALL = "Alle Nachrichten auswählen"
 LABEL_ARCHIVE = "Archivieren"
 LABEL_DELETE = "Löschen"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Vollbild (Vorschaubereich-Layout)"
 LABEL_VIEW_MESSAGE_ENTER = "Nachricht anzeigen (Kein Vorschaubereich-Layout)"
 LABEL_SWITCH_TO_MESSAGE = "Fokus auf ausgewählte Nachricht schalten"
 LABEL_SWITCH_TO_FOLDER_LIST = "Fokus auf Ordner-Liste schalten"
-
 LABEL_FULLSCREEN_TOGGLE = "Vollbildmodus umschalten"
 LABEL_BLOCKQUOTES_TOGGLE = "Nachricht-Blockzitate umschalten"
 LABEL_PRINT = "Drucken"
 LABEL_EXIT_FULLSCREEN = "Vollbildmodus verlassen"
 LABEL_CLOSE_MESSAGE = "Nachricht schließen (Kein Vorschaubereich-Layout)"
 LABEL_SWITCH_TO_LIST = "Fokus auf Nachrichtenliste zurückschalten"
-
 LABEL_OPEN_COMPOSE_POPUP = "Öffne Erstellen Popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Öffne Identitätenauswahl"
 LABEL_SAVE_MESSAGE = "Nachricht speichern"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Diese Nachricht kann nicht verschoben werden"
 CANT_SAVE_MESSAGE = "Diese Nachricht kann nicht gespeichert werden"
 CANT_SEND_MESSAGE = "Diese Nachricht kann nicht gesendet werden"
 INVALID_RECIPIENTS = "Ungültige Empfänger-Adresse"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Dieser Ordner kann nicht angelegt werden"
 CANT_RENAME_FOLDER = "Dieser Ordner kann nicht umbenannt werden"
 CANT_DELETE_FOLDER = "Dieser Ordner kann nicht gelöscht werden"
@@ -614,15 +662,12 @@ BACK_LINK = "Aktualisieren"
 DOMAIN_LIST_DESC = "Liste der Domains, auf die zugegriffen werden darf"
 PHP_EXSTENSIONS_ERROR_DESC = "Notwendige PHP-Erweiterungen sind in Ihrer PHP-Konfiguration nicht vorhanden!"
 PHP_VERSION_ERROR_DESC = "Ihre PHP Version (%VERSION%) ist älter als die notwendige Version: 5.3.0!"
-
 NO_SCRIPT_TITLE = "Diese Anwendung benötigt JavaScript."
 NO_SCRIPT_DESC = "Ihr Browser unterstützt JavaScript nicht.
 Aktivieren Sie bitte die Javascript-Unterstützung in Ihrem Browser und versuchen Sie es noch einmal."
-
 NO_COOKIE_TITLE = "Diese Anwendung benötigt Cookies."
 NO_COOKIE_DESC = "Ihr Browser unterstützt Cookies nicht.
 Aktivieren Sie bitte die Cookie-Unterstützung in Ihrem Browser und versuchen Sie es noch einmal."
-
 BAD_BROWSER_TITLE = "Ihr Browser ist veraltet."
 BAD_BROWSER_DESC = "Um alle Features dieser Anwendung nutzen zu können,
-sollten Sie einen aktuellen Browser installieren!"
+sollten Sie einen aktuellen Browser installieren!"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini
index 0cf9d15a7..ad125ba03 100644
--- a/rainloop/v/0.0.0/langs/en.ini
+++ b/rainloop/v/0.0.0/langs/en.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Login"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Select system folders"
 SELECT_CHOOSE_ONE = "Choose one"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Trash"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Cancel"
 BUTTON_CLOSE = "Close"
-
 NOTIFICATION_SENT = "You haven't selected \"Sent\" system folder messages are put to after sending.
 If you don't want to save sent message, please select \"Do not use\" option."
-
 NOTIFICATION_DRAFTS = "You haven't selected \"Drafts\" system folder messages are saved to while composing."
-
 NOTIFICATION_SPAM = "You haven't selected \"Spam\" system folder spamed messages are placed to.
 If you wish to remove messages permanently, please select \"Do not use\" option."
-
 NOTIFICATION_TRASH = "You haven't selected \"Trash\" system folder deleted messages are placed to.
 If you wish to remove messages permanently, please select \"Do not use\" option."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -370,16 +403,21 @@ LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Back"
 
 [SETTINGS_FILTERS]
-TITLE_CREATE_FILTER = "Create a filter?"
-TITLE_EDIT_FILTER = "Update filter?"
 LEGEND_FILTERS = "Filters"
 BUTTON_SAVE = "Save"
-BUTTON_DONE = "Done"
 BUTTON_ADD_FILTER = "Add a Filter"
-BUTTON_ADD_CONDITION = "Add a Condition"
 BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
 LOADING_PROCESS = "Updating filter list"
 DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
 
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identity"
@@ -532,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward as attachment(s)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -546,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -598,6 +633,8 @@ CANT_MOVE_MESSAGE = "Can't move message"
 CANT_SAVE_MESSAGE = "Can't save message"
 CANT_SEND_MESSAGE = "Can't send message"
 INVALID_RECIPIENTS = "Invalid recipients"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Can't create folder"
 CANT_RENAME_FOLDER = "Can't rename folder"
 CANT_DELETE_FOLDER = "Can't delete folder"
@@ -625,15 +662,12 @@ BACK_LINK = "Reload"
 DOMAIN_LIST_DESC = "List of domains webmail is allowed to access."
 PHP_EXSTENSIONS_ERROR_DESC = "Required PHP extension are not available in your PHP configuration!"
 PHP_VERSION_ERROR_DESC = "Your PHP version (%VERSION%) is lower than the minimal required 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript is required for this application."
 NO_SCRIPT_DESC = "JavaScript support is not available in your browser.
 Please enable JavaScript support in your browser settings and retry."
-
 NO_COOKIE_TITLE = "Cookies support is required for this application."
 NO_COOKIE_DESC = "Cookies support is not available in your browser.
 Please enable Cookie support in your browser settings and retry."
-
 BAD_BROWSER_TITLE = "Your browser is outdated."
 BAD_BROWSER_DESC = "To use all the features of the application,
-download and install one of these browsers:"
+download and install one of these browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini
index acfa2448f..5cb08b91e 100644
--- a/rainloop/v/0.0.0/langs/es.ini
+++ b/rainloop/v/0.0.0/langs/es.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Login"
@@ -294,7 +295,7 @@ LABEL_KEY_BIT_LENGTH = "Longitud de la llave"
 BUTTON_GENERATE_OPEN_PGP_KEYS = "Generar"
 
 [POPUPS_COMPOSE_OPEN_PGP]
-TITLE_COMPOSE_OPEN_PGP = "Firmar/Cifrar con OpenPGP "
+TITLE_COMPOSE_OPEN_PGP = "Firmar/Cifrar con OpenPGP"
 LABEL_SIGN = "Firmar"
 LABEL_ENCRYPT = "Encriptar"
 LABEL_PASSWORD = "Contraseña"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "Prueba de verificación de 2 pasos"
 LABEL_CODE = "Código"
 BUTTON_TEST = "Probar"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Seleccione las carpetas del sistema"
 SELECT_CHOOSE_ONE = "Elija una"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Papelera"
 LABEL_ARCHIVE = "Archivo"
 BUTTON_CANCEL = "Cancelar"
 BUTTON_CLOSE = "Cerrar"
-
 NOTIFICATION_SENT = "Usted no ha seleccionado la carpeta del sistema para guardar los \"Enviados\".
 Si no desea guardar los mensajes enviados, por favor seleccione la opción \"No usar\"."
-
 NOTIFICATION_DRAFTS = "Usted no ha seleccionado la carpeta del sistema para guardar los \"Borradores\"."
-
 NOTIFICATION_SPAM = "Usted no ha seleccionado la carpeta del sistema para alojar los mensajes marcados como \"Spam\".
 Si desea eliminar los mensajes permanentemente, por favor seleccione la opción \"No usar\"."
-
 NOTIFICATION_TRASH = "Usted no ha seleccionado la carpeta del sistema para alojar los mensajes enviados a la \"Papelera\" .
 Si desea eliminar los mensajes permanentemente, por favor seleccione la opción \"No usar\"."
-
 NOTIFICATION_ARCHIVE = "Usted no ha seleccionado la carpeta del sistema para alojar los mensajes enviados al \"Archivo\"."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Contraseña"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Atrás"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identidad"
 LABEL_DISPLAY_NAME = "Nombre"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Responder a todos"
 LABEL_FORWARD = "Adelante"
 LABEL_FORWARD_MULTIPLY = "Reenviar (multiplicar)"
 LABEL_HELP = "Ayuda"
-
 LABEL_CHECK_ALL = "Comprobar todos los mensajes"
 LABEL_ARCHIVE = "Archivo"
 LABEL_DELETE = "Eliminar"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Pantalla completa (panel de vista previa)"
 LABEL_VIEW_MESSAGE_ENTER = "Ver mensaje (No hay diseño panel de vista previa)"
 LABEL_SWITCH_TO_MESSAGE = "Cambiar foco a mensaje seleccionado"
 LABEL_SWITCH_TO_FOLDER_LIST = "Cambiar foco a la lista de carpetas"
-
 LABEL_FULLSCREEN_TOGGLE = "Cambiar a modo de pantalla completa"
 LABEL_BLOCKQUOTES_TOGGLE = "Cambiar blockquotes de mensaje"
 LABEL_PRINT = "Imprimir"
 LABEL_EXIT_FULLSCREEN = "Salir del modo de pantalla completa"
 LABEL_CLOSE_MESSAGE = "Cerrar el mensaje (No hay diseño panel de vista previa)"
 LABEL_SWITCH_TO_LIST = "Cambiar foco de nuevo a la lista de mensajes"
-
 LABEL_OPEN_COMPOSE_POPUP = "Abrir ventana de redacción"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Abrir ventana de identidades"
 LABEL_SAVE_MESSAGE = "Guardar aviso"
@@ -551,10 +598,10 @@ LABEL_CLOSE_COMPOSE = "Cerrar componer"
 [PGP_NOTIFICATIONS]
 NO_PUBLIC_KEYS_FOUND = "No se encontraron claves públicas"
 NO_PUBLIC_KEYS_FOUND_FOR = "No hay claves públicas encontrados para el email %MAIL%"
-NO_PRIVATE_KEY_FOUND = "No se encontró la clave privada "
+NO_PRIVATE_KEY_FOUND = "No se encontró la clave privada"
 NO_PRIVATE_KEY_FOUND_FOR = "No hay una clave privada para el email %EMAIL%"
 UNVERIFIRED_SIGNATURE = "Firma no verificada"
-DECRYPTION_ERROR = "Error de descifrado OpenPGP "
+DECRYPTION_ERROR = "Error de descifrado OpenPGP"
 GOOD_SIGNATURE = "Buena firma de %USER%"
 PGP_ERROR = "Error OpenPGP: %ERROR%"
 SPECIFY_FROM_EMAIL = "Por favor, especifique dirección de correo electrónico PARA"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "No se puede mover el mensaje"
 CANT_SAVE_MESSAGE = "No se puede guardar el mensaje"
 CANT_SEND_MESSAGE = "No se puede enviar el mensaje"
 INVALID_RECIPIENTS = "Los destinatarios no son válidos"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "No se puede crear la carpeta"
 CANT_RENAME_FOLDER = "No se puede renombrar la carpeta"
 CANT_DELETE_FOLDER = "No se puede eliminar la carpeta"
@@ -613,15 +662,12 @@ BACK_LINK = "Recargar"
 DOMAIN_LIST_DESC = "Lista de dominios de correo web que se le permite acceder."
 PHP_EXSTENSIONS_ERROR_DESC = "La extensión de PHP requerida no está disponible en su configuración de PHP!"
 PHP_VERSION_ERROR_DESC = "Su versión de PHP (%VERSION%) es menor a la mínima requerida 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript es requerido para esta aplicación."
 NO_SCRIPT_DESC = "JavaScript no está disponible en su navegador.
 Por favor habilite el soporte JavaScript en la configuración de su navegador e inténtelo de nuevo."
-
 NO_COOKIE_TITLE = "Los Cookies son requeridos para esta aplicación."
 NO_COOKIE_DESC = "El soporte de Cookies no esta disponible en su navegador.
 Por favor habilite los Cookie en la configuración de su navegador e inténtelo de nuevo."
-
 BAD_BROWSER_TITLE = "Su navegador no está actualizado."
 BAD_BROWSER_DESC = "Para usar todas las características de esta aplicación,
 descargue e instale uno de estos navegadores:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini
index 0f7dae154..ba799ce8b 100644
--- a/rainloop/v/0.0.0/langs/fr.ini
+++ b/rainloop/v/0.0.0/langs/fr.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Identifiant"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "Test d'authentification en deux étapes"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Sélectionner les dossiers système"
 SELECT_CHOOSE_ONE = "Faites un choix"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Corbeille"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Annuler"
 BUTTON_CLOSE = "Fermer"
-
 NOTIFICATION_SENT = "Vous n'avez pas sélectionné de dossier \"Envoyés\" où copier les messages après envoi.
 Si vous ne souhaitez pas enregistrer une copie des messages envoyés, sélectionner l'option \"Ne pas utiliser\"."
-
 NOTIFICATION_DRAFTS = "Vous n'avez pas sélectionné de dossier \"Brouillons\" où enregistrer les message en cours de rédaction."
-
 NOTIFICATION_SPAM = "Vous n'avez pas sélectionné de dossier \"Spam\" où placer les indésirables.
 Si vous ne souhaitez supprimer définitivement les messages, sélectionner l'option \"Ne pas utiliser\"."
-
 NOTIFICATION_TRASH = "Vous n'avez pas sélectionné de dossier \"Corbeille\" où placer les messages supprimés.
 Si vous ne souhaitez supprimer définitivement les messages, sélectionner l'option \"Ne pas utiliser\"."
-
 NOTIFICATION_ARCHIVE = "Vous n'avez pas sélectionné de dossier \"Archive\" où placer les messages archivés."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Mot de passe"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Retour"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identité"
 LABEL_DISPLAY_NAME = "Nom"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Répondre à tous"
 LABEL_FORWARD = "Réexpédier"
 LABEL_FORWARD_MULTIPLY = "Réexpédier (multiple)"
 LABEL_HELP = "Aide"
-
 LABEL_CHECK_ALL = "Marquer tous les messages comme lus"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Supprimer"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Plein écran (Mise en page avec aperçu)"
 LABEL_VIEW_MESSAGE_ENTER = "Voir le message (Mise en page sans aperçu)"
 LABEL_SWITCH_TO_MESSAGE = "Aller au message sélectionné"
 LABEL_SWITCH_TO_FOLDER_LIST = "Aller à la liste des dossiers"
-
 LABEL_FULLSCREEN_TOGGLE = "Basculer le mode plein écran"
 LABEL_BLOCKQUOTES_TOGGLE = "Basculer les citations en bloc"
 LABEL_PRINT = "Imprimer"
 LABEL_EXIT_FULLSCREEN = "Quitter le mode plein écran"
 LABEL_CLOSE_MESSAGE = "Fermer le message (Mise en page sans aperçu)"
 LABEL_SWITCH_TO_LIST = "Retourner à la liste des messages"
-
 LABEL_OPEN_COMPOSE_POPUP = "Ouvrir la fenêtre d'écriture"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Liste de sélection des identitiés"
 LABEL_SAVE_MESSAGE = "Enregistrer le message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Impossible de déplacer le message"
 CANT_SAVE_MESSAGE = "Impossible d'enregistrer le message"
 CANT_SEND_MESSAGE = "Impossible d'envoyer le message"
 INVALID_RECIPIENTS = "Destinataires invalides"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Impossible de créer le dossier"
 CANT_RENAME_FOLDER = "Impossible de renommer le dossier"
 CANT_DELETE_FOLDER = "Impossible de supprimer le dossier"
@@ -613,15 +662,12 @@ BACK_LINK = "Recharger"
 DOMAIN_LIST_DESC = "Liste des domaines autorisés."
 PHP_EXSTENSIONS_ERROR_DESC = "Les extensions PHP nécessaires ne sont pas disponibles dans votre configuration de PHP !"
 PHP_VERSION_ERROR_DESC = "Votre version de PHP (% VERSION%) est inférieure à la minimale requise 5.3.0 !"
-
 NO_SCRIPT_TITLE = "JavaScript est nécessaire pour cette application."
 NO_SCRIPT_DESC = "Le support de JavaScript n'est pas disponible dans votre navigateur.
 S'il vous plaît activer le support de JavaScript dans les paramètres de votre navigateur et réessayez."
-
 NO_COOKIE_TITLE = "Le support des cookies est nécessaire pour cette application."
 NO_COOKIE_DESC = "Le support des cookies n'est pas disponible dans votre navigateur.
 S'il vous plaît activer le support des cookies dans les paramètres de votre navigateur et réessayez."
-
 BAD_BROWSER_TITLE = "Votre navigateur n'est pas à jour."
 BAD_BROWSER_DESC = "Pour utiliser toutes les fonctionnalités de l'application,
-télécharger et installer l'un de ces navigateurs :"
+télécharger et installer l'un de ces navigateurs :"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini
index 4550cc20f..32f7d99b7 100644
--- a/rainloop/v/0.0.0/langs/hu.ini
+++ b/rainloop/v/0.0.0/langs/hu.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-mail"
 LABEL_LOGIN = "Belépés"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-lépés hitelesítés teszt"
 LABEL_CODE = "Kód"
 BUTTON_TEST = "Tesztelés"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Rendszermappák kiválasztása"
 SELECT_CHOOSE_ONE = "Egy kiválasztása"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Lomtár"
 LABEL_ARCHIVE = "Archivált"
 BUTTON_CANCEL = "Mégse"
 BUTTON_CLOSE = "Bezárás"
-
 NOTIFICATION_SENT = "You haven't selected \"Sent\" system folder messages are put to after sending.
 If you don't want to save sent message, please select \"Do not use\" option."
-
 NOTIFICATION_DRAFTS = "You haven't selected \"Drafts\" system folder messages are saved to while composing."
-
 NOTIFICATION_SPAM = "You haven't selected \"Spam\" system folder spamed messages are placed to.
 If you wish to remove messages permanently, please select \"Do not use\" option."
-
 NOTIFICATION_TRASH = "You haven't selected \"Trash\" system folder deleted messages are placed to.
 If you wish to remove messages permanently, please select \"Do not use\" option."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Jelszó"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Vissza"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identity"
 LABEL_DISPLAY_NAME = "Name"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Súgó"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archiválás"
 LABEL_DELETE = "Tőrlés"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Nyomtatás"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Levél mentés"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Can't move message"
 CANT_SAVE_MESSAGE = "Can't save message"
 CANT_SEND_MESSAGE = "Can't send message"
 INVALID_RECIPIENTS = "Invalid recipients"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Can't create folder"
 CANT_RENAME_FOLDER = "Can't rename folder"
 CANT_DELETE_FOLDER = "Can't delete folder"
@@ -613,15 +662,12 @@ BACK_LINK = "Újratöltés"
 DOMAIN_LIST_DESC = "List of domains webmail is allowed to access."
 PHP_EXSTENSIONS_ERROR_DESC = "Required PHP extension are not available in your PHP configuration!"
 PHP_VERSION_ERROR_DESC = "Your PHP version (%VERSION%) is lower than the minimal required 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript is required for this application."
 NO_SCRIPT_DESC = "JavaScript support is not available in your browser.
 Please enable JavaScript support in your browser settings and retry."
-
 NO_COOKIE_TITLE = "Cookies support is required for this application."
 NO_COOKIE_DESC = "Cookies support is not available in your browser.
 Please enable Cookie support in your browser settings and retry."
-
 BAD_BROWSER_TITLE = "A böngésző elavult."
 BAD_BROWSER_DESC = "To use all the features of the application,
-download and install one of these browsers:"
+download and install one of these browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini
index 5e660a4ef..7b9abc82b 100644
--- a/rainloop/v/0.0.0/langs/is.ini
+++ b/rainloop/v/0.0.0/langs/is.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Netfang"
 LABEL_LOGIN = "Innskrá"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Veldu kerfismöppur"
 SELECT_CHOOSE_ONE = "Veldu eitt"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Ruslatunna"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Hætta við"
 BUTTON_CLOSE = "Loka"
-
 NOTIFICATION_SENT = "Þú hefur ekki valið \"Sent\" kerfismöppu bréf sem eru sett í eftir sendingu.
 Ef þú vilt ekki vista bréfið, vinsamlegast veldu \"Ekki nota\" valmöguleikann."
-
 NOTIFICATION_DRAFTS = "Þú hefur ekki valið \"Drög\" kerfismöppu bréf sem eru vistuð í þegar þú skrifar."
-
 NOTIFICATION_SPAM = "Þú hefur ekki valið \"Ruslpóstur\" system kerfismöppu sem ruslpósts bréf eru sett í.
 Ef þú vilt fjarlægja bréf endanlega, vinsamlegast veldu \"Ekki nota\" valmöguleikann."
-
 NOTIFICATION_TRASH = "Þú hefur ekki valið \"Ruslatunna\" kerfismöppu sem eydd bréf eru sett í.
 Ef þú vilt fjarlægja bréfið endanlega, vinsamlegast veldu \"Ekki nota\" valmöguleikann."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -363,12 +396,29 @@ LABEL_IDENTITY_NAME = "Identity"
 LABEL_IDENTITIES_NAME = "Identities"
 LABEL_FILTERS_NAME = "Filters"
 LABEL_SECURITY_NAME = "Security"
-LABEL_SOCIAL_NAMELABEL_SOCIAL_NAME = "Félagsmiðlar"
+LABEL_SOCIAL_NAME = "Social"
 LABEL_THEMES_NAME = "Þemur"
 LABEL_CHANGE_PASSWORD_NAME = "Lykilorð"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Til baka"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identity"
 LABEL_DISPLAY_NAME = "Nafn"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Get ekki fært bréf"
 CANT_SAVE_MESSAGE = "Get ekki vistað bréf"
 CANT_SEND_MESSAGE = "Get ekki  sent bréf"
 INVALID_RECIPIENTS = "Rangir viðtakendur"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Get ekki búið til möppu"
 CANT_RENAME_FOLDER = "Get ekki endurnefnt möppu"
 CANT_DELETE_FOLDER = "Get ekki eytt möppu"
@@ -613,15 +662,12 @@ BACK_LINK = "Endurhlaða"
 DOMAIN_LIST_DESC = "Listi yfir lén sem vefpóstur má tengjast."
 PHP_EXSTENSIONS_ERROR_DESC = "Nauðsynlegar PHP framlenginar eru ekki til staðar í PHP uppsetningunni þinni!"
 PHP_VERSION_ERROR_DESC = "PHP útgáfan þín (%VERSION%) er eldri en lágmarks útgáfa sem krafist er (5.3.0)!"
-
 NO_SCRIPT_TITLE = "JavaScript er nauðsynlegt fyrir þetta forrit."
 NO_SCRIPT_DESC = "JavaScript stuðningur er ekki til staðar fyrir vafrann þinn.
 Vinsamlegast gerðu JavaScript virkt í vafranum þínum og reyndu aftur."
-
 NO_COOKIE_TITLE = "Köku stuðningur er nauðsynlegur fyrir þetta forrit."
 NO_COOKIE_DESC = "Köku stuðningur er ekki til staðar í vafranum þínum.
 Vinsamlegast gerðu JavaScript virkt í vafranum þínum og reyndu aftur."
-
 BAD_BROWSER_TITLE = "Vafrinn þinn er úreltur."
 BAD_BROWSER_DESC = "Til að geta notað alla valmöguleika í þessu forriti,
-niðurhalaðu og settu upp einn af þessum vöfrum:"
+niðurhalaðu og settu upp einn af þessum vöfrum:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini
index ff8d83464..28d2d4a41 100644
--- a/rainloop/v/0.0.0/langs/it.ini
+++ b/rainloop/v/0.0.0/langs/it.ini
@@ -1,4 +1,4 @@
-[LOGIN]
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Login"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "Verifica a 2 fattori"
 LABEL_CODE = "Codice"
 BUTTON_TEST = "Esegui test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Seleziona le cartelle di sistema"
 SELECT_CHOOSE_ONE = "Selezionane una"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Cestino"
 LABEL_ARCHIVE = "Archivio"
 BUTTON_CANCEL = "Annulla"
 BUTTON_CLOSE = "Chiudi"
-
 NOTIFICATION_SENT = "Non hai selezionato una cartella di sistema per la posta inviata.
 Se non vuoi salvare i messaggi inviati seleziona \"Non usarla\"."
-
 NOTIFICATION_DRAFTS = "Non hai selezionato una cartella di sistema per le bozze."
-
 NOTIFICATION_SPAM = "Non hai selezionato una cartella di sistema per i messaggi indesiderati.
 Se li vuoi rimuovere permanentemente seleziona \"Non usarla\"."
-
 NOTIFICATION_TRASH = "Non hai selezionato una cartella di sistema per il cestino.
 Se non lo vuoi usare (e quindi cancellare i messaggi permanentemente) seleziona \"Non usarla\"."
-
 NOTIFICATION_ARCHIVE = "Non hai selezionato una cartella di sistema per i messaggi archiviati."
 
 [TITLES]
@@ -370,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Password"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Indietro"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identità"
 LABEL_DISPLAY_NAME = "Nome"
@@ -521,7 +570,6 @@ LABEL_REPLY_ALL = "Rispondi a tutti"
 LABEL_FORWARD = "Inoltra"
 LABEL_FORWARD_MULTIPLY = "Inoltro multiplo"
 LABEL_HELP = "Aiuto"
-
 LABEL_CHECK_ALL = "Seleziona tutti i messaggi"
 LABEL_ARCHIVE = "Archivia messaggio"
 LABEL_DELETE = "Cancella messaggio"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Schermo intero (con anteprima messaggi)"
 LABEL_VIEW_MESSAGE_ENTER = "Visualizza messaggio (senza anteprima messaggi)"
 LABEL_SWITCH_TO_MESSAGE = "Sposta la selezione sul messaggio corrente"
 LABEL_SWITCH_TO_FOLDER_LIST = "Sposta la selezione sulla lista delle cartelle"
-
 LABEL_FULLSCREEN_TOGGLE = "Attiva/disattiva la modalità a schermo intero"
 LABEL_BLOCKQUOTES_TOGGLE = "Mostra/nascondi le citazioni"
 LABEL_PRINT = "Stampa"
 LABEL_EXIT_FULLSCREEN = "Esci dalla modalità a schermo intero"
 LABEL_CLOSE_MESSAGE = "Chiudi messaggio (senza anteprima messaggi)"
 LABEL_SWITCH_TO_LIST = "Sposta la selezione sulla lista messaggi"
-
 LABEL_OPEN_COMPOSE_POPUP = "Apri finestra di scrittura"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Apri la tendina di selezione dell'identità"
 LABEL_SAVE_MESSAGE = "Salva messaggio"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Impossibile spostare il messaggio"
 CANT_SAVE_MESSAGE = "Impossibile salvare il messaggio"
 CANT_SEND_MESSAGE = "Impossibile incollare il messaggio"
 INVALID_RECIPIENTS = "Destinatario non valido"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Impossibile creare la cartella"
 CANT_RENAME_FOLDER = "Impossibile rinominare la cartella"
 CANT_DELETE_FOLDER = "Impossibile cancellare la cartella"
@@ -614,15 +662,12 @@ BACK_LINK = "Ricarica"
 DOMAIN_LIST_DESC = "Lista dei domini abilitati ad accedere"
 PHP_EXSTENSIONS_ERROR_DESC = "È richiesta un'estensione di PHP non installata!"
 PHP_VERSION_ERROR_DESC = "La tua versione di PHP (%VERSION%) è meno recente della 5.3.0!"
-
 NO_SCRIPT_TITLE = "È richiesto JavaScript per questa applicazione."
 NO_SCRIPT_DESC = "Il supporto a JavaScript è disabilitato.
 Abilitare il supporto a JavaScript e riprovare."
-
 NO_COOKIE_TITLE = "Sono richiesti i Cookie per questa applicazione."
 NO_COOKIE_DESC = "Il supporto ai Cookie è disabilitato.
 Abilitare il supporto ai Cookie e riprovare."
-
 BAD_BROWSER_TITLE = "Il tuo browser è vecchio"
 BAD_BROWSER_DESC = "Per usare tutte le funzionalità dell'applicazione,
-scarica ed installa uno dei seguenti browser:"
+scarica ed installa uno dei seguenti browser:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini
index 251861bdd..87825e294 100644
--- a/rainloop/v/0.0.0/langs/ja-jp.ini
+++ b/rainloop/v/0.0.0/langs/ja-jp.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "メールアドレス"
 LABEL_LOGIN = "ログイン"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Select system folders"
 SELECT_CHOOSE_ONE = "Choose one"
@@ -318,18 +356,13 @@ LABEL_TRASH = "ゴミ箱"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "キャンセル"
 BUTTON_CLOSE = "閉じる"
-
 NOTIFICATION_SENT = "You haven't selected \"Sent\" system folder messages are put to after sending.
 If you don't want to save sent message, please select \"Do not use\" option."
-
 NOTIFICATION_DRAFTS = "You haven't selected \"Drafts\" system folder messages are saved to while composing."
-
 NOTIFICATION_SPAM = "You haven't selected \"Spam\" system folder spamed messages are placed to.
 If you wish to remove messages permanently, please select \"Do not use\" option."
-
 NOTIFICATION_TRASH = "You haven't selected \"Trash\" system folder deleted messages are placed to.
 If you wish to remove messages permanently, please select \"Do not use\" option."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Password"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "戻る"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "表示名"
 LABEL_DISPLAY_NAME = "名前"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Can't move message"
 CANT_SAVE_MESSAGE = "Can't save message"
 CANT_SEND_MESSAGE = "Can't send message"
 INVALID_RECIPIENTS = "Invalid recipients"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Can't create folder"
 CANT_RENAME_FOLDER = "Can't rename folder"
 CANT_DELETE_FOLDER = "Can't delete folder"
@@ -613,15 +662,12 @@ BACK_LINK = "Reload"
 DOMAIN_LIST_DESC = "List of domains webmail is allowed to access."
 PHP_EXSTENSIONS_ERROR_DESC = "Required PHP extension are not available in your PHP configuration!"
 PHP_VERSION_ERROR_DESC = "Your PHP version (%VERSION%) is lower than the minimal required 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript is required for this application."
 NO_SCRIPT_DESC = "JavaScript support is not available in your browser.
 Please enable JavaScript support in your browser settings and retry."
-
 NO_COOKIE_TITLE = "Cookies support is required for this application."
 NO_COOKIE_DESC = "Cookies support is not available in your browser.
 Please enable Cookie support in your browser settings and retry."
-
 BAD_BROWSER_TITLE = "Your browser is outdated."
 BAD_BROWSER_DESC = "To use all the features of the application,
-download and install one of these browsers:"
+download and install one of these browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini
index 283d01038..d6dd2b3e4 100644
--- a/rainloop/v/0.0.0/langs/ko-kr.ini
+++ b/rainloop/v/0.0.0/langs/ko-kr.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "이메일 주소"
 LABEL_LOGIN = "아이디"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "메일함을 지정해주세요"
 SELECT_CHOOSE_ONE = "선택해주세요"
@@ -318,15 +356,10 @@ LABEL_TRASH = "휴지통"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "취소"
 BUTTON_CLOSE = "닫기"
-
 NOTIFICATION_SENT = "보낸 편지함 폴더가 지정되지 않았습니다. 보낸 메시지를 보관하지 않고 삭제하려면 \"사용하지 않음\" 옵션을 선택해주세요."
-
 NOTIFICATION_DRAFTS = "임시 보관함 폴더가 지정되지 않았습니다."
-
 NOTIFICATION_SPAM = "스팸함 폴더가 지정되지 않았습니다. 스팸처리한 메시지를 보관하지 않고 바로 삭제하려면 \"사용하지 않음\" 옵션을 선택해주세요."
-
 NOTIFICATION_TRASH = "휴지통 폴더가 지정되지 않았습니다. 삭제한 메시지를 휴지통에 보관하지 않고 바로 삭제하려면 \"사용하지 않음\" 옵션을 선택해주세요."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -366,6 +399,23 @@ LABEL_CHANGE_PASSWORD_NAME = "비밀번호"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "뒤로"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "신원"
 LABEL_DISPLAY_NAME = "이름"
@@ -517,7 +567,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -531,14 +580,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -583,6 +630,8 @@ CANT_MOVE_MESSAGE = "메시지를 이동할 수 없습니다."
 CANT_SAVE_MESSAGE = "메시지를 저장할 수 없습니다."
 CANT_SEND_MESSAGE = "메시지를 보낼 수 없습니다."
 INVALID_RECIPIENTS = "수신인 오류"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "폴더를 생성할 수 없습니다."
 CANT_RENAME_FOLDER = "폴더명을 변경할 수 없습니다."
 CANT_DELETE_FOLDER = "폴더를 삭제할 수 없습니다."
@@ -610,12 +659,9 @@ BACK_LINK = "새로고침"
 DOMAIN_LIST_DESC = "접근이 허가된 도메인 목록입니다."
 PHP_EXSTENSIONS_ERROR_DESC = "필요한 PHP 확장이 구성되지 않았습니다!"
 PHP_VERSION_ERROR_DESC = "현재 사용 중인 PHP 버전 (%VERSION%)이 너무 낮습니다. 최소 5.3.0 이상을 설치해주세요!"
-
 NO_SCRIPT_TITLE = "자바스크립트 필요"
 NO_SCRIPT_DESC = "사용 중인 브라우저가 자바스크립트를 지원하지 않습니다. 브라우저 설정을 확인하여 자바스크립트 사용을 활성화하고 다시 시도해주세요."
-
 NO_COOKIE_TITLE = "이 어플리케이션을 사용하려면 쿠키 사용이 지원되야 합니다."
 NO_COOKIE_DESC = "사용 중인 브라우저가 쿠키를 지원하지 않습니다. 브라우저 설정을 확인하여 쿠키 사용을 활성화하고 다시 시도해주세요."
-
 BAD_BROWSER_TITLE = "사용 중인 브라우저가 구버전입니다."
-BAD_BROWSER_DESC = "이 어플리케이션을 정상적으로 사용하시려면 아래의 브라우저들 중 하나를 설치해주세요:"
+BAD_BROWSER_DESC = "이 어플리케이션을 정상적으로 사용하시려면 아래의 브라우저들 중 하나를 설치해주세요:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini
index 26c2ce09c..95a7ace76 100644
--- a/rainloop/v/0.0.0/langs/lt.ini
+++ b/rainloop/v/0.0.0/langs/lt.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-paštas"
 LABEL_LOGIN = "Prisijungimo vardas"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "E-paštas"
 LABEL_PHONE = "Telefonas"
 LABEL_WEB = "Tinklapis"
 LABEL_BIRTHDAY = "Gimtadienis"
-LABEL_TAGS = "Žymos"
 LINK_ADD_EMAIL = "Pridėti elektroninio pašto adresą"
 LINK_ADD_PHONE = "Pridėti telefono Nr."
 LINK_BIRTHDAY = "Gimtadienis"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "2-jų žingsnių patikrinimo bandymas"
 LABEL_CODE = "Kodas"
 BUTTON_TEST = "Bandyti"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Pasirinkti sisteminius katalogus"
 SELECT_CHOOSE_ONE = "Pasirinkite vieną"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Šiukšliadėžė"
 LABEL_ARCHIVE = "Archyvas"
 BUTTON_CANCEL = "Atšaukti"
 BUTTON_CLOSE = "Uždaryti"
-
 NOTIFICATION_SENT = "Nepasirinkote \"Išsiųstieji\" katalogo išsiųstiems laiškams saugoti.
 Jei nenorite saugoti laiškų po išsiuntimo, pasirinkite \"Nenaudoti\" variantą."
-
 NOTIFICATION_DRAFTS = "Nepasirinkote  \"Juodraščiai\" sisteminio katalogo žinutėms, kurios saugomos kol jas rašote."
-
 NOTIFICATION_SPAM = "Nepasirinkote \"Šlamštas\" sisteminio katalogo laikyti nepageidaujamies laiškams.
 Jei norite nekaupti šlamšto ir iškart išmesti, pasirinkite \"Nenaudoti\" variantą."
-
 NOTIFICATION_TRASH = "Nepasirinkote \"Šiukšliadėžė\" sisteminio katalogo ištrintoms žinutėms.
 Jei nenorite naudotis šiukšliadėže ir išmesti laiškus visam laikui iškart juos trinant, pasirinkite  \"Nenaudoti\" variantą."
-
 NOTIFICATION_ARCHIVE = "Nepasirinkote \"Archyvas\" sisteminio katalogo."
 
 [TITLES]
@@ -370,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Slaptažodis"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Atgal"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Tapatybė"
 LABEL_DISPLAY_NAME = "Vardas"
@@ -391,7 +440,7 @@ BUTTON_SHOW_SECRET = "Rodyti slaptažodį"
 BUTTON_HIDE_SECRET = "Slėpti slaptažodį"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Sukonfiguruota"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nesukonfiguruota"
-TWO_FACTOR_SECRET_DESC = "Importuoti šią informaciją į "Google" autentifikavimo klientą naudojant žemiau pateiktą QR kodą arba įveskite kodą rankiniu būdu."
+TWO_FACTOR_SECRET_DESC = "Importuoti šią informaciją į Google autentifikavimo klientą naudojant žemiau pateiktą QR kodą arba įveskite kodą rankiniu būdu."
 TWO_FACTOR_BACKUP_CODES_DESC = "Jei negaunate kodo per Google autentifikavimo klientą, galite nautotis savo sukurta atsargine kodų kopija. Kai panaudosite atsarginę kopiją prisijungimui, ji taps neaktyvi."
 
 [SETTINGS_GENERAL]
@@ -521,7 +570,6 @@ LABEL_REPLY_ALL = "Atsakyti visiems"
 LABEL_FORWARD = "Persiųsti"
 LABEL_FORWARD_MULTIPLY = "Persiųsti kaip prisegtuką"
 LABEL_HELP = "Pagalba"
-
 LABEL_CHECK_ALL = "Žymėti visus laiškus"
 LABEL_ARCHIVE = "Archyvuoti"
 LABEL_DELETE = "Šalinti"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Visas ekranas (Peržiūros lauko išdėstymas)"
 LABEL_VIEW_MESSAGE_ENTER = "Žiūrėti laišką (Be peržiūros lauko)"
 LABEL_SWITCH_TO_MESSAGE = "Perjungti į pasirinktą laišką"
 LABEL_SWITCH_TO_FOLDER_LIST = "Perjungti į laiškų sąrašą"
-
 LABEL_FULLSCREEN_TOGGLE = "Perjungti viso ekrano režimą"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Spausdinti"
 LABEL_EXIT_FULLSCREEN = "Išeiti iš viso ekrano režimo"
 LABEL_CLOSE_MESSAGE = "Uždaryti laišką (Be peržiūros lauko)"
 LABEL_SWITCH_TO_LIST = "Perjungti atgal į laiškų sąrašą"
-
 LABEL_OPEN_COMPOSE_POPUP = "Sukurti naują laišką atskirame lange"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Atidaryti tapatybių sąrašą"
 LABEL_SAVE_MESSAGE = "Išsaugoti laišką"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Nepavyko perkelti laiško"
 CANT_SAVE_MESSAGE = "Nepavyko išsaugoti laiško"
 CANT_SEND_MESSAGE = "Nepavyko išsiųsti laiško"
 INVALID_RECIPIENTS = "Netinkamas gavėjas"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Nepavyksta sukurti katalogo"
 CANT_RENAME_FOLDER = "Nepavyksta pervadinti katalogo"
 CANT_DELETE_FOLDER = "Nepavyksta pašalinti katalogo"
@@ -614,15 +662,12 @@ BACK_LINK = "Perkrauti"
 DOMAIN_LIST_DESC = "Leidžiamų naudoti subdomenų sąrašas."
 PHP_EXSTENSIONS_ERROR_DESC = "Trūksta būtinų PHP plėtinių!"
 PHP_VERSION_ERROR_DESC = "Jūsų PHP versija (%VERSION%) žemesnė, nei reikalaujama 5.3.0!"
-
 NO_SCRIPT_TITLE = "Šiai aplikacijai reikalinga JavaScript."
 NO_SCRIPT_DESC = "JavaScript nepalaikoma Jūsų naršyklėje.
 Įjunkite JavaScript palaikymą naršyklėje ir bandykite vėl."
-
 NO_COOKIE_TITLE = "Slapukų palaikymas būtinas šiai aplikacijai."
 NO_COOKIE_DESC = "Slapukų paialikymas negalimas jūsų naršyklėje.
 Įjunkite slapukų palaikymą naršyklėje ir bandykite vėl."
-
 BAD_BROWSER_TITLE = "Jūsų naršyklė pasenusi."
 BAD_BROWSER_DESC = "Norint naudotis visais šios aplikacijos privalumais,
-parsisiųskite ir įsidiekite vieną iš šių naršyklių:"
+parsisiųskite ir įsidiekite vieną iš šių naršyklių:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini
index 497011c54..432e1d2bb 100644
--- a/rainloop/v/0.0.0/langs/lv.ini
+++ b/rainloop/v/0.0.0/langs/lv.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-pasts"
 LABEL_LOGIN = "Ielogoties"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Izvēlaties sistēmas mapes"
 SELECT_CHOOSE_ONE = "Izvēlaties vienu"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Miskaste"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Atcelt"
 BUTTON_CLOSE = "Aizvērt"
-
 NOTIFICATION_SENT = "Tu neesi izvēlējies \"Izsūtne\" sistēmas mapi, kurā ziņojumi tiek ielikti pēc nosūtīšanas.
 Ja nevēlie saglabāt nosūtīto ziņu, lūdzu izvēlies \"Nelietot\" opciju."
-
 NOTIFICATION_DRAFTS = "Tu neesi izvēlējies \"Melnraksti\" sistemas mapi, kurā tiktu saglabāti ziņojumi, kamēr tie tiek rakstīti."
-
 NOTIFICATION_SPAM = "Tu neesi izvēlējies \"Spams\" sistēmas mapi, kurā tiks ievietoti spam ziņojumi.
 Ja tu vēlies izdzēst ziņojumus pavisam, izvēlies \"Neizmantot\" opciju."
-
 NOTIFICATION_TRASH = "Tu neesi izvēlējies \"Miskaste\" sistēmas mapi.
 Ja tu vēlies izdzēst ziņojumus pavisam, izvēlies \"Neizmantot\" opciju."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Parole"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Atpakaļ"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identity"
 LABEL_DISPLAY_NAME = "Vārds"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Nevar pārvietot ziņojumu"
 CANT_SAVE_MESSAGE = "Nevar saglabāt ziņojumu"
 CANT_SEND_MESSAGE = "Nevar nosūtīt ziņojumu"
 INVALID_RECIPIENTS = "Nepareizi saņēmēji"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Nevar izveidot mapi"
 CANT_RENAME_FOLDER = "Nevar pārsaukt mapi"
 CANT_DELETE_FOLDER = "Nevar izdzēst mapi"
@@ -610,18 +659,15 @@ UNKNOWN_ERROR = "Nezināma kļūda"
 
 [STATIC]
 BACK_LINK = "Pārlādēt"
-DOMAIN_LIST_DESC = "Saraksts ar atļautajiem domēniem "
+DOMAIN_LIST_DESC = "Saraksts ar atļautajiem domēniem"
 PHP_EXSTENSIONS_ERROR_DESC = "Nepieciešamie PHP extension nav pieejami jūsu PHP konfigurācijā!"
 PHP_VERSION_ERROR_DESC = "Jūsus PHP versija (%VERSION%) ir zemāka nekā atļauts 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript ir nepieciešams."
 NO_SCRIPT_DESC = "Jūsu pārlūkprogramma neatbalsta JavaScript.
 Lūdzu ieslēdziet JavaScript atbalstu."
-
 NO_COOKIE_TITLE = "Cookies atbalsts ir nepieciešams."
 NO_COOKIE_DESC = "Cookies atbalsts nav pieejams šai pārlūkprogrammai.
 Lūdzu ieslēdziet Cookies atbalstu."
-
 BAD_BROWSER_TITLE = "Jūsu pārlūkprogramma ir novecojusi."
 BAD_BROWSER_DESC = "Lai izmantotu pilnas šis aplikācijas iespējas,
-lejupielādējat un uzinstalējas kādu no šīm pārlukprogrammām:"
+lejupielādējat un uzinstalējas kādu no šīm pārlukprogrammām:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini
index 5f7463c12..2af0541e6 100644
--- a/rainloop/v/0.0.0/langs/nl.ini
+++ b/rainloop/v/0.0.0/langs/nl.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-mail"
 LABEL_LOGIN = "Inlognaam"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Stap verificatie test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Selecteer systeem mappen"
 SELECT_CHOOSE_ONE = "Kies één"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Verwijderde items"
 LABEL_ARCHIVE = "Archief"
 BUTTON_CANCEL = "Annuleer"
 BUTTON_CLOSE = "Sluiten"
-
 NOTIFICATION_SENT = "U heeft nog geen \"Verzonden items\" folder aangeduid waar de berichten geplaatst worden na het versturen.
 Indien u geen verzonden berichten wilt bewaren, kies de \"Niet gebruiken\" optie."
-
 NOTIFICATION_DRAFTS = "U heeft nog geen \"Concepten\" folder aangeduid waar de berichten bewaard worden tijdens het opstellen."
-
 NOTIFICATION_SPAM = "U heeft nog geen \"Ongewenste e-mail\" folder aangeduid waar de spam berichten geplaatst worden.
 Indien u berichten permanent wilt verwijderen, kies de \"Niet gebruiken\" optie."
-
 NOTIFICATION_TRASH = "U heeft nog geen \"Verwijderde items\" folder aangeduid waar de verwijderde berichten geplaatst worden.
 Indien u berichten permanent wilt verwijderen, kies de \"Niet gebruiken\" optie."
-
 NOTIFICATION_ARCHIVE = "U heeft nog geen \"Archief\" map aangeduid waar de gearchiveerde berichten geplaatst worden."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Wachtwoord"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Terug"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identiteit"
 LABEL_DISPLAY_NAME = "Naam"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Alle beantwoorden"
 LABEL_FORWARD = "Doorsturen"
 LABEL_FORWARD_MULTIPLY = "Doorsturen als bijlage(n)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Selecteer alle berichten"
 LABEL_ARCHIVE = "Archiveren"
 LABEL_DELETE = "Verwijderen"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Bericht in volledig scherm lezen (leesvenster ingescha
 LABEL_VIEW_MESSAGE_ENTER = "Bericht lezen (leesvenster uitgeschakeld)"
 LABEL_SWITCH_TO_MESSAGE = "Schakel focus naar bericht"
 LABEL_SWITCH_TO_FOLDER_LIST = "Schakel focus naar berichten lijst"
-
 LABEL_FULLSCREEN_TOGGLE = "Schakel tussen normaal en lezen in volledig scherm"
 LABEL_BLOCKQUOTES_TOGGLE = "Schakel blok citaten aan of uit"
 LABEL_PRINT = "Afdrukken"
 LABEL_EXIT_FULLSCREEN = "Volledig scherm sluiten"
 LABEL_CLOSE_MESSAGE = "Bericht sluiten (leesvenster uitgeschakeld)"
 LABEL_SWITCH_TO_LIST = "Schakel focus terug naar berichten lijst"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open nieuw bericht venster"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identiteiten menu"
 LABEL_SAVE_MESSAGE = "Concept opslaan"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Kan bericht niet verplaatsen"
 CANT_SAVE_MESSAGE = "Kan bericht niet opslaan"
 CANT_SEND_MESSAGE = "Kan bericht niet verzenden"
 INVALID_RECIPIENTS = "Onjuiste ontvangers"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Kan map niet aanmaken"
 CANT_RENAME_FOLDER = "Kan map niet hernoemen"
 CANT_DELETE_FOLDER = "Kan map niet verwijderen"
@@ -613,15 +662,12 @@ BACK_LINK = "Opnieuw laden"
 DOMAIN_LIST_DESC = "Lijst van webmail domeinen die toegankelijk zijn"
 PHP_EXSTENSIONS_ERROR_DESC = "Vereiste PHP extensies zijn niet beschikbaar in uw PHP configuratie!"
 PHP_VERSION_ERROR_DESC = "Uw PHP versie (%VERSION%) is lager dan de minimaal vereiste 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript is benodigd voor deze applicatie"
 NO_SCRIPT_DESC = "JavaScript ondersteuning is niet beschikbaar in uw browser.
 Gelieve Javascript in te schakelen en opnieuw te proberen."
-
 NO_COOKIE_TITLE = "Cookies ondersteuning is nodig voor deze applicatie"
 NO_COOKIE_DESC = "Cookies ondersteuning is niet beschikbaar in uw browser.
 Gelieve Cookies in te schakelen en opnieuw te proberen."
-
 BAD_BROWSER_TITLE = "Uw browser is verouderd"
 BAD_BROWSER_DESC = "Om alle functies van deze applicatie te gebruiken,
-download en installeer een van de volgende browsers:"
+download en installeer een van de volgende browsers:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini
index 6f83db8dc..c5aed8272 100644
--- a/rainloop/v/0.0.0/langs/no.ini
+++ b/rainloop/v/0.0.0/langs/no.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Epost"
 LABEL_LOGIN = "Logg inn"
@@ -306,6 +307,43 @@ TITLE_TEST_CODE = "2-stegs verifiseringstest"
 LABEL_CODE = "Kode"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Velg systemmapper"
 SELECT_CHOOSE_ONE = "Velg en"
@@ -317,18 +355,13 @@ LABEL_TRASH = "Søppel"
 LABEL_ARCHIVE = "Arkiv"
 BUTTON_CANCEL = "Avbryt"
 BUTTON_CLOSE = "Lukk"
-
 NOTIFICATION_SENT = "Du har ikke valgt \"Sendt\" som mappen hvor meldinger blir lagret til etter sending .
 Hvis du ikke ønsker å lagre sendte meldingen, kan du velge \"Ikke bruk\" alternativet ."
-
 NOTIFICATION_DRAFTS = "Du har ikke valgt \"Kladd\" som mappen hvor meldinger lagres når du skriver ."
-
 NOTIFICATION_SPAM = "Du har ikke valgt \"Spam\" som mappen hvor spammail blir flyttet til.
 Hvis du ønsker å fjerne meldinger permanent, velger du \"Ikke bruk\" alternativet ."
-
 NOTIFICATION_TRASH = "Du har ikke valgt \"Søppel\" som mappen hvor slettede meldinger blir flyttet til.
 Hvis du ønsker å fjerne meldinger permanent, velger du \"Ikke bruk\" alternativet ."
-
 NOTIFICATION_ARCHIVE = "Du har ikke valgt \"Arkiv\" som mappen hvor arkiverte meldinger blir flyttet til."
 
 [TITLES]
@@ -368,6 +401,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Passord"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Tilbake"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identitet"
 LABEL_DISPLAY_NAME = "Navn"
@@ -519,13 +569,12 @@ LABEL_REPLY_ALL = "Svar alle"
 LABEL_FORWARD = "Videresend"
 LABEL_FORWARD_MULTIPLY = "Videresent (mange)"
 LABEL_HELP = "Hjelp"
-
 LABEL_CHECK_ALL = "Merk alle meldinger"
 LABEL_ARCHIVE = "Arkiver"
 LABEL_DELETE = "Slett"
 LABEL_MOVE = "Flytt"
 LABEL_READ = "Merk som lest"
-LABEL_UNREAD = "Merk som ulest "
+LABEL_UNREAD = "Merk som ulest"
 LABEL_IMPORTANT = "Merk som flagget/viktig"
 LABEL_SEARCH = "Søk"
 LABEL_CANCEL_SEARCH = "Avbryt søk"
@@ -533,14 +582,12 @@ LABEL_FULLSCREEN_ENTER = "Fullskjerm"
 LABEL_VIEW_MESSAGE_ENTER = "Vis melding"
 LABEL_SWITCH_TO_MESSAGE = "Flytt fokus til valgt melding"
 LABEL_SWITCH_TO_FOLDER_LIST = "Flytt fokus til mappeliste"
-
 LABEL_FULLSCREEN_TOGGLE = "Fullskjerm modus"
 LABEL_BLOCKQUOTES_TOGGLE = "Vis/skjul sitert melding"
 LABEL_PRINT = "Skriv ut"
 LABEL_EXIT_FULLSCREEN = "Avslutt fullskjerm modus"
 LABEL_CLOSE_MESSAGE = "Lukk melding"
 LABEL_SWITCH_TO_LIST = "Flytt fokus til meldingsliste"
-
 LABEL_OPEN_COMPOSE_POPUP = "Ny melding i popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Åpne identitetsliste"
 LABEL_SAVE_MESSAGE = "Lagre melding"
@@ -585,6 +632,8 @@ CANT_MOVE_MESSAGE = "Kan ikke flytte meldingen"
 CANT_SAVE_MESSAGE = "Kan ikke lagre melding"
 CANT_SEND_MESSAGE = "Kan ikke sende melding"
 INVALID_RECIPIENTS = "Ugyldige mottakere"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Kan ikke opprette mappe"
 CANT_RENAME_FOLDER = "Kan ikke endre navn på mappen"
 CANT_DELETE_FOLDER = "Kan ikke slette mappen"
@@ -612,15 +661,12 @@ BACK_LINK = "Oppdater"
 DOMAIN_LIST_DESC = "Liste over domener webmail kan få tilgang til"
 PHP_EXSTENSIONS_ERROR_DESC = "Nødvendig PHP-utvidelse er ikke tilgjengelig i din PHP-konfigurasjon!"
 PHP_VERSION_ERROR_DESC = "Din PHP versjon (%VERSION%) er lavere enn versjon 5.3.0"
-
 NO_SCRIPT_TITLE = "Javascript er nødvendig for dette programmet."
 NO_SCRIPT_DESC = "Javascript støtte er ikke tilgjengelig i nettleseren din.
 Vennligst aktiver Javascript-støtte i nettleserens innstillinger, og prøv på nytt."
-
 NO_COOKIE_TITLE = "Cookies-støtte er nødvendig for dette programmet."
 NO_COOKIE_DESC = "Cookies-støtte er ikke tilgjengelig i nettleseren din .
 Vennligst aktiver Cookie-støtte i nettleserens innstillinger, og prøv på nytt ."
-
 BAD_BROWSER_TITLE = "Nettleseren din er utdatert."
 BAD_BROWSER_DESC = "Hvis du vil bruke alle funksjonene i programmet,
-last ned og installerer en av disse nettleserne:"
+last ned og installerer en av disse nettleserne:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini
index e70c1939d..a6cb96466 100644
--- a/rainloop/v/0.0.0/langs/pl.ini
+++ b/rainloop/v/0.0.0/langs/pl.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-mail"
 LABEL_LOGIN = "Login"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "E-mail"
 LABEL_PHONE = "Telefon"
 LABEL_WEB = "Strona WWW"
 LABEL_BIRTHDAY = "Urodziny"
-LABEL_TAGS = "Tagi"
 LINK_ADD_EMAIL = "Dodaj adres e-mail"
 LINK_ADD_PHONE = "Dodaj nr telefonu"
 LINK_BIRTHDAY = "Urodziny"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "Test weryfikacji 2-stopniowej"
 LABEL_CODE = "Kod"
 BUTTON_TEST = "Testuj"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Wybierz foldery systemowe"
 SELECT_CHOOSE_ONE = "Wybierz"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Kosz"
 LABEL_ARCHIVE = "Archiwum"
 BUTTON_CANCEL = "Anuluj"
 BUTTON_CLOSE = "Zamknij"
-
 NOTIFICATION_SENT = "Nie został wybrany folder \"Wysłane\", do którego przenoszone są wiadomości po wysłaniu.
 Jeżeli wysłane wiadomości nie mają być przechowywane, proszę o zaznaczenie opcji: \"Nie używaj\"."
-
 NOTIFICATION_DRAFTS = "Nie został wybrany folder \"Wersje robocze\", do którego są zapisywane wiadomości w trakcie ich tworzenia."
-
 NOTIFICATION_SPAM = "Nie został wybrany folder \"Spam\", do którego przenoszone są wiadomości oznaczone jako SPAM.
 Jeżeli wiadomości oznaczone jako spam mają być usuwane na stałe, proszę o zaznaczenie opcji: \"Nie używaj\"."
-
 NOTIFICATION_TRASH = "Nie został wybrany folder \"Kosz\", do którego przenoszone są wszystkie usunięte wiadomości.
 Jeżeli wiadomości usunięte mają być usuwane na stałe, proszę o zaznaczenie opcji: \"Nie używaj\"."
-
 NOTIFICATION_ARCHIVE = "Nie został wybrany folder \"Archiwum\", zostanie użyty systemowy folder archiwizowanych wiadomości."
 
 [TITLES]
@@ -371,18 +403,21 @@ LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Wstecz"
 
 [SETTINGS_FILTERS]
-TITLE_CREATE_FILTER = "Utworzyć filtr ?"
-TITLE_EDIT_FILTER = "Zaktualizować filtr ?"
 LEGEND_FILTERS = "Filtry"
 BUTTON_SAVE = "Zapisz"
-BUTTON_DONE = "Zrobione"
 BUTTON_ADD_FILTER = "Dodaj filtr"
-BUTTON_SAVE_FILTER = "Zapisz filtr"
-BUTTON_DELETE_FILTER = "Usuń filtr"
-BUTTON_ADD_CONDITION = "Dodaj warunek"
 BUTTON_DELETE = "Usuń"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
 LOADING_PROCESS = "Aktualizowanie listy filtrów"
 DELETING_ASK = "Czy jesteś pewien ?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
 
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Tożsamość"
@@ -535,7 +570,6 @@ LABEL_REPLY_ALL = "Odpowiedz wszystkim"
 LABEL_FORWARD = "Przekaż"
 LABEL_FORWARD_MULTIPLY = "Przekaż (wielokrotnie)"
 LABEL_HELP = "Pomoc"
-
 LABEL_CHECK_ALL = "Sprawdź wszystkie wiadomości"
 LABEL_ARCHIVE = "Archiwum"
 LABEL_DELETE = "Usuń"
@@ -549,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Pełny ekran (aktywny podgląd wiadomości)"
 LABEL_VIEW_MESSAGE_ENTER = "Pokaż wiadomość (nieaktywny podgląd wiadomości)"
 LABEL_SWITCH_TO_MESSAGE = "Wybrana wiadomość na pierwszym planie"
 LABEL_SWITCH_TO_FOLDER_LIST = "Lista folderów na pierwszym planie"
-
 LABEL_FULLSCREEN_TOGGLE = "Tryb pełnoekranowy"
 LABEL_BLOCKQUOTES_TOGGLE = "Cytowanie wiadomości"
 LABEL_PRINT = "Drukuj"
 LABEL_EXIT_FULLSCREEN = "Opuść tryb pełnoekranowy"
 LABEL_CLOSE_MESSAGE = "Zamknij wiadomość (nieaktywny podgląd wiadomości)"
 LABEL_SWITCH_TO_LIST = "Powróc do widoku listy wiadomości"
-
 LABEL_OPEN_COMPOSE_POPUP = "Otwórz okno tworzenia wiadomości"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Otwórz menu wyboru tożsamości"
 LABEL_SAVE_MESSAGE = "Zapisz wiadomość"
@@ -601,6 +633,8 @@ CANT_MOVE_MESSAGE = "Nie można przenieść wiadomości"
 CANT_SAVE_MESSAGE = "Nie można zapisać wiadomości"
 CANT_SEND_MESSAGE = "Nie można wysłać wiadomości"
 INVALID_RECIPIENTS = "Nieprawidłowy adres odbiorcy"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Nie można utworzyć folderu"
 CANT_RENAME_FOLDER = "Nie można zmienić nazwy folderu"
 CANT_DELETE_FOLDER = "Nie można usunąć folderu"
@@ -628,15 +662,12 @@ BACK_LINK = "Odśwież"
 DOMAIN_LIST_DESC = "Lista domen do których webmail ma dostęp"
 PHP_EXSTENSIONS_ERROR_DESC = "Wymagane rozszerzenia PHP są niedostępne !"
 PHP_VERSION_ERROR_DESC = "Aktualnie zainstalowana wersja PHP: (%VERSION%), jest niższa niż minimalnie wymagana 5.3.0 !"
-
 NO_SCRIPT_TITLE = "Ta aplikacja wymaga JavaScript"
 NO_SCRIPT_DESC = "Twoja przeglądarka nie obsługuje JavaScript
 Proszę o umożliwienie obsługi JavaScript w przeglądarce, oraz ponowne załadowanie tej strony."
-
 NO_COOKIE_TITLE = "Ta aplikacja wymaga plików Cookies"
 NO_COOKIE_DESC = "Obsługa Cookies jest wyłączona w twojej przeglądarce
 Proszę o umożliwienie obsługi plików Cookie w przeglądarce oraz ponowne uruchomienie tej strony."
-
 BAD_BROWSER_TITLE = "Twoja przeglądarka jest przestarzała!"
 BAD_BROWSER_DESC = "W celu wykorzystania wszystkich funkcji tej aplikacji,
-zaktualizuj aktualnie używaną lub pobierz i zainstaluj jedną z poniższych przeglądarek:"
+zaktualizuj aktualnie używaną lub pobierz i zainstaluj jedną z poniższych przeglądarek:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini
index 3fed638ee..913ddcd51 100644
--- a/rainloop/v/0.0.0/langs/pt-br.ini
+++ b/rainloop/v/0.0.0/langs/pt-br.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-mail"
 LABEL_LOGIN = "Usuário"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "E-mail"
 LABEL_PHONE = "Telefone"
 LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Aniversário"
-LABEL_TAGS = "Tags"
 LINK_ADD_EMAIL = "Adicionar um endereço e-mail"
 LINK_ADD_PHONE = "Adicionar um telefone"
 LINK_BIRTHDAY = "Aniversário"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "Testar verificação de duas etapas"
 LABEL_CODE = "Código"
 BUTTON_TEST = "Testar"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Selecionar pastas do sistema"
 SELECT_CHOOSE_ONE = "Selecione uma"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Lixeira"
 LABEL_ARCHIVE = "Arquivadas"
 BUTTON_CANCEL = "Cancelar"
 BUTTON_CLOSE = "Fechar"
-
 NOTIFICATION_SENT = "Você não selecionou a pasta \"Enviadas\" do sistema que será colocada as mensagens após o envio.
 Se você não quiser salvar a mensagem enviada, por favor selecione a opção\"Não usar\"."
-
 NOTIFICATION_DRAFTS = "Você não selecionou a pasta \"Rascunhos\" do sistema que será colocada as mensagens salvas durante a composição."
-
 NOTIFICATION_SPAM = "Você não selecionou a pasta \"Lixo Eletrônico\" do sistema que será colocada as mensagens spams.
 Se você deseja remover a mensagem permanentemente, por favor selecione a opção\"Não usar\"."
-
 NOTIFICATION_TRASH = "Você não selecionou a pasta do sistema que serão colocadas as mensagens excluídas.
 Se você deseja remover a mensagem permanentemente, por favor selecione a opção\"Não usar\"."
-
 NOTIFICATION_ARCHIVE = "Você não selecionou a pasta \"Arquivadas\" do sistema que serão colocadas as mensagens arquivadas."
 
 [TITLES]
@@ -370,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Senha"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Voltar"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identidade"
 LABEL_DISPLAY_NAME = "Nome"
@@ -521,7 +570,6 @@ LABEL_REPLY_ALL = "Responder todos"
 LABEL_FORWARD = "Encaminhar"
 LABEL_FORWARD_MULTIPLY = "Encaminhar como anexo"
 LABEL_HELP = "Ajuda"
-
 LABEL_CHECK_ALL = "Selecionar todas as mensagens"
 LABEL_ARCHIVE = "Arquivar"
 LABEL_DELETE = "Excluir"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Tela-cheia (Com pré-visualização)"
 LABEL_VIEW_MESSAGE_ENTER = "Ver mensagem (Sem pré-visualização)"
 LABEL_SWITCH_TO_MESSAGE = "Mudar o foco para mensagem selecionada"
 LABEL_SWITCH_TO_FOLDER_LIST = "Mudar o foco para a lista de pastas"
-
 LABEL_FULLSCREEN_TOGGLE = "Alternar modo tela-cheia"
 LABEL_BLOCKQUOTES_TOGGLE = "Alternar blocos de citações de mensagem"
 LABEL_PRINT = "Imprimir"
 LABEL_EXIT_FULLSCREEN = "Sair do modo tela-cheia"
 LABEL_CLOSE_MESSAGE = "Fechar mensagem (Sem pré-visualização)"
 LABEL_SWITCH_TO_LIST = "Mudar o foco volta para a lista de mensagens"
-
 LABEL_OPEN_COMPOSE_POPUP = "Abrir pop-up de composição"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Abrir menu de identidades"
 LABEL_SAVE_MESSAGE = "Salvar mensagem"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Não foi possível mover a mensagem"
 CANT_SAVE_MESSAGE = "Não foi possível salvar a mensagem"
 CANT_SEND_MESSAGE = "Não foi possível enviar a mensagem"
 INVALID_RECIPIENTS = "Destinatário inválido"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Não foi possível criar a pasta"
 CANT_RENAME_FOLDER = "Não foi possível renomear a pasta"
 CANT_DELETE_FOLDER = "Não foi possível exluir a pasta"
@@ -614,15 +662,12 @@ BACK_LINK = "Recarregar"
 DOMAIN_LIST_DESC = "A lista de domínios de webmail tem permissão para acessar."
 PHP_EXSTENSIONS_ERROR_DESC = "Extensões necessárias PHP não estão disponíveis na sua configuração do PHP!"
 PHP_VERSION_ERROR_DESC = "Sua versão PHP (%VERSION%) é menor do que o mínimo exigido 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript é necessário para esta aplicação."
 NO_SCRIPT_DESC = "O JavaScript não está disponível em seu navegador.
 Por favor ative o suporte a JavaScript nas configurações do seu navegador e tente novamente."
-
 NO_COOKIE_TITLE = "É necessário suporte a cookies para esta aplicação."
 NO_COOKIE_DESC = "Os Cookies não estão disponíveis em seu navegador.
 Por favor ative o suporte a Cookies nas configurações do seu navegador e tente novamente."
-
 BAD_BROWSER_TITLE = "Seu navegador está desatualizado."
 BAD_BROWSER_DESC = "Para usar todos os recursos do aplicativo,
-baixe e instale um desses navegadores:"
+baixe e instale um desses navegadores:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini
index 0eba53d88..26eac7634 100644
--- a/rainloop/v/0.0.0/langs/pt-pt.ini
+++ b/rainloop/v/0.0.0/langs/pt-pt.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Usuário"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Selecione as pastas do sistema"
 SELECT_CHOOSE_ONE = "Escolha um"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Lixo"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Cancelar"
 BUTTON_CLOSE = "Fechar"
-
 NOTIFICATION_SENT = "Você não selecionou \"Sent\" as mensagens da pasta de sistema que são colocados após o envio.
 Se você não quiser salvar a mensagem enviada, por favor selecione a opção\"Do not use\"."
-
 NOTIFICATION_DRAFTS = "Você não selecionou \"Drafts\" as mensagens da pasta são salvas ao autor."
-
 NOTIFICATION_SPAM = "Você não selecionou \"Spam\" a pasta de mensagens Lixo Eletrônico do sistema, são colocados para.
 Se você deseja remover as mensagens permanentemente, por favor selecione a opção \"Do not use\"."
-
 NOTIFICATION_TRASH = "Você não selecionou \"Trash\" a pasta de mensagens excluídas do sistema que são colocadas para.
 Se você deseja remover as mensagens permanentemente, por favor selecione a opção \"Do not use\"."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Senha"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Voltar"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identidade"
 LABEL_DISPLAY_NAME = "Nome"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Não é possível mover a mensagem"
 CANT_SAVE_MESSAGE = "Não é possível salvar a mensagem"
 CANT_SEND_MESSAGE = "Não é possível enviar a mensagem"
 INVALID_RECIPIENTS = "Destinatário invpalido"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Não é possível criar esta pasta"
 CANT_RENAME_FOLDER = "Não é possível renomear esta pasta"
 CANT_DELETE_FOLDER = "Não é possível exluir esta pasta"
@@ -613,15 +662,12 @@ BACK_LINK = "Recarregar"
 DOMAIN_LIST_DESC = "A ista de domínios de webmail tem permissão para acessar."
 PHP_EXSTENSIONS_ERROR_DESC = "Extensão necessária PHP não estão disponíveis na sua configuração do PHP!"
 PHP_VERSION_ERROR_DESC = "Sua versão PHP (%VERSION%) é menor do que o domínio exigido 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript é necessário para esta aplicação."
 NO_SCRIPT_DESC = "O JavaScript não está disponível em seu navegador.
 Por favor ativar o suporte a JavaScript nas configurações do seu navegador e tente novamente."
-
 NO_COOKIE_TITLE = "É necessário suporte a cookies para esta aplicação."
 NO_COOKIE_DESC = "O Cookies não está disponível em seu navegador.
 Por favor ativar o suporte a Cookie nas configurações do seu navegador e tente novamente."
-
 BAD_BROWSER_TITLE = "Seu navegador está desatualizado."
 BAD_BROWSER_DESC = "Para usar todos os recursos do aplicativo,
-baixar e instalar um desses navegadores:"
+baixar e instalar um desses navegadores:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini
index df4c2b82a..38f27b204 100644
--- a/rainloop/v/0.0.0/langs/ro.ini
+++ b/rainloop/v/0.0.0/langs/ro.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Conectare"
@@ -306,6 +307,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Selectați dosarul de sistem"
 SELECT_CHOOSE_ONE = "Nu a fost încă selectat"
@@ -317,18 +355,13 @@ LABEL_TRASH = "Șterse"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Anulează"
 BUTTON_CLOSE = "Închide"
-
 NOTIFICATION_SENT = "Вы еще не выбрали системную папку \"Отправленные\", в которую складываются все сообщения после отправки.
 Если вы не хотите сохранять отправленные письма, пожалуйста, выберите пункт \"Не использовать\"."
-
 NOTIFICATION_DRAFTS = "Вы еще не выбрали системную папку \"Черновики\", в которую складываются все сохраненые сообщения."
-
 NOTIFICATION_SPAM = "Вы еще не выбрали системную папку \"Спам\", в которую складываются все спамовые сообщения.
 Если же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\"."
-
 NOTIFICATION_TRASH = "Вы еще не выбрали системную папку \"Удаленные\", в которую складываются все сообщения после удаления.
 Если же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\"."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -368,6 +401,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Parolă"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Înapoi"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Setările de profil"
 LABEL_DISPLAY_NAME = "Nume"
@@ -519,7 +569,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -533,14 +582,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -585,6 +632,8 @@ CANT_MOVE_MESSAGE = "Nu pot muta scrisoarea.Încercați din nou"
 CANT_SAVE_MESSAGE = "Nu pot salva mesajul. Încercați din nou"
 CANT_SEND_MESSAGE = "Nu pot trimite scrisoarea.Încercați din nou"
 INVALID_RECIPIENTS = "Verificați dacă ați introdus toate adresele."
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Nu crea dosarul. Încercați din nou"
 CANT_RENAME_FOLDER = "Nu pot redenumi dosarul. Încercați din nou"
 CANT_DELETE_FOLDER = "Nu pot șterge dosarul. Încercați din nou"
@@ -612,15 +661,12 @@ BACK_LINK = "Actualizare"
 DOMAIN_LIST_DESC = "Lista de domenii care au permisiunea de a fi accesate prin webmail."
 PHP_EXSTENSIONS_ERROR_DESC = "Extensiile PHP necesare nu sunt instalate pe server-ul dvs.!"
 PHP_VERSION_ERROR_DESC = "Versiunea dvs. de PHP (%VERSION%) este mai mica de cea dorită, 5.3.0!"
-
 NO_SCRIPT_TITLE = "Pentru rulare este necesar JavaScript."
 NO_SCRIPT_DESC = "Aparent, JavaScript nu este instalat, sau nu este acceptat de browserul dumneavoastră.
 Activați JavaScript, schimband optiunile browserului dvs., apoi încercați din nou."
-
 NO_COOKIE_TITLE = "Cererea necesită Cookie-uri."
 NO_COOKIE_DESC = "Aparent, Cookie sau nu este acceptat de browser-ul dvs. sau oprit.
 Întoarceți Cookie, schimband optiunile browserului dvs., apoi încercați din nou."
-
 BAD_BROWSER_TITLE = "Browser-ul dvs. este depășit."
 BAD_BROWSER_DESC = "Pentru a utiliza toate caracteristicile cererii,
 descărcați și instalați unul dintre aceste browsere:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini
index 18dcacffa..429e6d5b5 100644
--- a/rainloop/v/0.0.0/langs/ru.ini
+++ b/rainloop/v/0.0.0/langs/ru.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Почта"
 LABEL_LOGIN = "Логин"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "Тест двухфакторной верификации"
 LABEL_CODE = "Код"
 BUTTON_TEST = "Тест"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Выберите системые папки"
 SELECT_CHOOSE_ONE = "Еще не выбрана"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Удаленные"
 LABEL_ARCHIVE = "Архив"
 BUTTON_CANCEL = "Отменить"
 BUTTON_CLOSE = "Закрыть"
-
 NOTIFICATION_SENT = "Вы еще не выбрали системную папку \"Отправленные\", в которую складываются все сообщения после отправки.
 Если вы не хотите сохранять отправленные письма, пожалуйста, выберите пункт \"Не использовать\"."
-
 NOTIFICATION_DRAFTS = "Вы еще не выбрали системную папку \"Черновики\", в которую складываются все сохраненые сообщения."
-
 NOTIFICATION_SPAM = "Вы еще не выбрали системную папку \"Спам\", в которую складываются все спамовые сообщения.
 Если же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\"."
-
 NOTIFICATION_TRASH = "Вы еще не выбрали системную папку \"Удаленные\", в которую складываются все сообщения после удаления.
 Если же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\"."
-
 NOTIFICATION_ARCHIVE = "Вы еще не выбрали системную папку \"Архив\", в которую складываются все сообщения после архивации."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Пароль"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Назад"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Настройки профиля"
 LABEL_DISPLAY_NAME = "Имя"
@@ -514,14 +564,12 @@ TAB_MAILBOX = "Почта"
 TAB_MESSAGE_LIST = "Список сообщений"
 TAB_MESSAGE_VIEW = "Просмотр сообщения"
 TAB_COMPOSE = "Написание письма"
-
 LABEL_OPEN_USER_DROPDOWN = "Открыть выпадающий список пользователя"
 LABEL_REPLY = "Ответить"
 LABEL_REPLY_ALL = "Ответить всем"
 LABEL_FORWARD = "Переслать"
 LABEL_FORWARD_MULTIPLY = "Переслать все выбранные сообщения"
 LABEL_HELP = "Помощь"
-
 LABEL_CHECK_ALL = "Выбрать все сообщения"
 LABEL_ARCHIVE = "Архивировать"
 LABEL_DELETE = "Удалить"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Полноэкранный режим"
 LABEL_VIEW_MESSAGE_ENTER = "Просмотр сообщения"
 LABEL_SWITCH_TO_MESSAGE = "Переключить фокус на выбранное сообщение"
 LABEL_SWITCH_TO_FOLDER_LIST = "Переключить фокус на список папок"
-
 LABEL_FULLSCREEN_TOGGLE = "Переключить полноэкранный режим"
 LABEL_BLOCKQUOTES_TOGGLE = "Переключение видимости цитат в письме"
 LABEL_PRINT = "Распечатать"
 LABEL_EXIT_FULLSCREEN = "Выйти из полноэкранного режима"
 LABEL_CLOSE_MESSAGE = "Закрыть сообщение"
 LABEL_SWITCH_TO_LIST = "Переключить фокус на список писем"
-
 LABEL_OPEN_COMPOSE_POPUP = "Написать письмо"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Выбрать отправителя"
 LABEL_SAVE_MESSAGE = "Сохранить сообщение"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Не могу переместить письмо"
 CANT_SAVE_MESSAGE = "Не могу сохранить письмо"
 CANT_SEND_MESSAGE = "Не могу отправить письмо"
 INVALID_RECIPIENTS = "Проверьте правильность ввода всех адресов."
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Не могу создать папку"
 CANT_RENAME_FOLDER = "Не могу переименовать папку"
 CANT_DELETE_FOLDER = "Не могу удалить папку"
@@ -614,15 +662,12 @@ BACK_LINK = "Обновить"
 DOMAIN_LIST_DESC = "Список доменов, к которым разрешен доступ через веб почту."
 PHP_EXSTENSIONS_ERROR_DESC = "Необходимые расширения PHP не установлены на вашем сервере!"
 PHP_VERSION_ERROR_DESC = "Ваша версия PHP (%VERSION%) ниже требуемой 5.3.0!"
-
 NO_SCRIPT_TITLE = "Для работы приложения необходим JavaScript."
 NO_SCRIPT_DESC = "По-видимому, JavaScript либо не поддерживается вашим браузером, либо отключен.
 Включите JavaScript, изменив настройки браузера, затем повторите попытку."
-
 NO_COOKIE_TITLE = "Для работы приложения необходимы Cookie."
 NO_COOKIE_DESC = "По-видимому, Cookie либо не поддерживаются вашим браузером, либо отключены.
 Включите Cookie, изменив настройки браузера, затем повторите попытку."
-
 BAD_BROWSER_TITLE = "Ваш браузер устарел."
 BAD_BROWSER_DESC = "Чтобы использовать все возможности приложения,
-загрузите и установите один из этих браузеров:"
+загрузите и установите один из этих браузеров:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini
index e4fb64330..428c8c803 100644
--- a/rainloop/v/0.0.0/langs/sk.ini
+++ b/rainloop/v/0.0.0/langs/sk.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Email"
 LABEL_LOGIN = "Používateľské meno"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "2-Step verification test"
 LABEL_CODE = "Code"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Spravovať Systémové priečinky"
 SELECT_CHOOSE_ONE = "Vybrať"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Kôš"
 LABEL_ARCHIVE = "Archive"
 BUTTON_CANCEL = "Zrušiť"
 BUTTON_CLOSE = "Zatvoriť"
-
 NOTIFICATION_SENT = "Nepriradili ste systémový priečinok \"Odoslané\" kam budú správy presunuté po ich odoslaní.
 Ak nechcete ukladať odoslané správy, vyberte prosím možnosť \"Nepoužívať\"."
-
 NOTIFICATION_DRAFTS = "Nepriradili ste systémový priečinok pre \"Koncepty\" kam sú správy ukladané počas ich písania."
-
 NOTIFICATION_SPAM = "Nepriradili ste systémový priečinok pre \"Spam\" kam sú ukladané nevyžiadané správy.
 Ak si želáte takéto správy odstraňovať natrvalo, vyberte prosím možnosť \"Nepoužívať\"."
-
 NOTIFICATION_TRASH = "Nepriradili ste systémový priečinok pre \"Kôš\" kam sú správy presunuté po ich odstránení.
 Ak si želáte takéto správy odstraňovať natrvalo, vyberte prosím možnosť \"Nepoužívať\"."
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Heslo"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Späť"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identita"
 LABEL_DISPLAY_NAME = "Meno"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "Reply All"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "Help"
-
 LABEL_CHECK_ALL = "Check All messages"
 LABEL_ARCHIVE = "Archive"
 LABEL_DELETE = "Delete"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "Správu sa nepodarilo presunúť"
 CANT_SAVE_MESSAGE = "Správu sa nepodarilo uložiť"
 CANT_SEND_MESSAGE = "Správu sa nepodarilo odoslať"
 INVALID_RECIPIENTS = "Neplatný príjemcovia"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Priečinok sa nepodarilo vytvoriť"
 CANT_RENAME_FOLDER = "Priečinok sa nepodarilo premenovať"
 CANT_DELETE_FOLDER = "Priečinok sa nepodarilo odstrániť"
@@ -613,15 +662,12 @@ BACK_LINK = "Obnoviť"
 DOMAIN_LIST_DESC = "Zoznam domén ku ktorým je povolené pristupovať cez webmail."
 PHP_EXSTENSIONS_ERROR_DESC = "Required PHP extension are not available in your PHP configuration!"
 PHP_VERSION_ERROR_DESC = "Your PHP version (%VERSION%) is lower than the minimal required 5.3.0!"
-
 NO_SCRIPT_TITLE = "Táto aplikácia vyžaduje JavaScript."
 NO_SCRIPT_DESC = "Váš internetový prehliadač nepodporuje JavaScript.
 Prosím povoľte podporu JavaScriptu v nastaveniach vášho internetového prehliadača a skúste to znova."
-
 NO_COOKIE_TITLE = "Táto aplikácia vyžaduje podporu Cookies."
 NO_COOKIE_DESC = "Váš internetový prehliadač nepodporuje Cookies.
 Prosím povoľte podporu Cookies v nastaveniach vášho internetového prehliadača a skúste to znova."
-
 BAD_BROWSER_TITLE = "Používate zastaralý internetový prehliadač."
 BAD_BROWSER_DESC = "Aby ste mohli využívať všetky funkcie tejto aplikácie,
-použite niektorý z nasledujúcich internetových prehliadačov:"
+použite niektorý z nasledujúcich internetových prehliadačov:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini
index 7e951fb66..ae0c495ad 100644
--- a/rainloop/v/0.0.0/langs/sv.ini
+++ b/rainloop/v/0.0.0/langs/sv.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Epost"
 LABEL_LOGIN = "Användarnamn"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "Epost"
 LABEL_PHONE = "Telefon"
 LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Födelsedag"
-LABEL_TAGS = "Taggar"
 LINK_ADD_EMAIL = "Lägg till epostadress"
 LINK_ADD_PHONE = "Lägg till telefonnummer"
 LINK_BIRTHDAY = "Födelsedag"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "2-Stegs verifikations test"
 LABEL_CODE = "Kod"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Välj systemmappar"
 SELECT_CHOOSE_ONE = "Välj en"
@@ -319,18 +356,13 @@ LABEL_TRASH = "Papperskorg"
 LABEL_ARCHIVE = "Arkiv"
 BUTTON_CANCEL = "Avbryt"
 BUTTON_CLOSE = "Stäng"
-
 NOTIFICATION_SENT = "Du har inte valt \"Skickat\" systemmapp, där skickade meddelande ska sparas.
 Om du inte vill spara skickade meddelanden, välj då \"Använd inte\" valet."
-
 NOTIFICATION_DRAFTS = "Du har inte valt \"Drafts\" systemmapp, där meddelanden sparas medan det skrivs."
-
 NOTIFICATION_SPAM = "Du har inte valt \"Spam\" systemmapp, där spam meddelanden ska sparas.
 Om du vill tabort meddelanden permanent, välj då \"Använd inte\" valet."
-
 NOTIFICATION_TRASH = "Du har inte valt \"Papperskorg\" systemmapp, där borttagna meddelanden ska sparas.
 Om du vill ta meddelanden permanent, väl då \"Använd inte\" valet."
-
 NOTIFICATION_ARCHIVE = "Du har inte valt \"Arkiv\" systemmapp, där arkiverade meddelanden ska läggas."
 
 [TITLES]
@@ -371,18 +403,21 @@ LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Tillbaka"
 
 [SETTINGS_FILTERS]
-TITLE_CREATE_FILTER = "Skapa filter?"
-TITLE_EDIT_FILTER = "Uppdatera filter?"
 LEGEND_FILTERS = "Filter"
 BUTTON_SAVE = "Spara"
-BUTTON_DONE = "Klart"
 BUTTON_ADD_FILTER = "Lägg till filter"
-BUTTON_SAVE_FILTER = "Spara filter"
-BUTTON_DELETE_FILTER = "Tabort filter"
-BUTTON_ADD_CONDITION = "Lägg till villkor"
 BUTTON_DELETE = "Tabort"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
 LOADING_PROCESS = "Uppdaterar filter listan"
 DELETING_ASK = "Är du säker?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
 
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Identitet"
@@ -535,7 +570,6 @@ LABEL_REPLY_ALL = "Svara alla"
 LABEL_FORWARD = "Vidarebefodra"
 LABEL_FORWARD_MULTIPLY = "Vidarebefodra som bilaga(or)"
 LABEL_HELP = "Hjälp"
-
 LABEL_CHECK_ALL = "Kontrollera alla meddelanden"
 LABEL_ARCHIVE = "Arkiv"
 LABEL_DELETE = "Ta bort"
@@ -549,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullskärm (Förhandsgranskings-layout)"
 LABEL_VIEW_MESSAGE_ENTER = "Visa meddelande (Ingen fullskärm)"
 LABEL_SWITCH_TO_MESSAGE = "Flytta fokus till valda meddelande"
 LABEL_SWITCH_TO_FOLDER_LIST = "Flytta fokus till mapplistan"
-
 LABEL_FULLSCREEN_TOGGLE = "Växla fullskärmsläge"
 LABEL_BLOCKQUOTES_TOGGLE = "Växla meddelande-citat"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Avsluta fullskärmsläge"
 LABEL_CLOSE_MESSAGE = "Stäng meddelande (Ingen förhandsgransknings-layout)"
 LABEL_SWITCH_TO_LIST = "Växla fokus tillbaka till meddelandelistan"
-
 LABEL_OPEN_COMPOSE_POPUP = "Öppna skrivfönster"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Öppna identitetsval"
 LABEL_SAVE_MESSAGE = "Spara meddelande"
@@ -601,6 +633,8 @@ CANT_MOVE_MESSAGE = "Kan inte flytta meddelande"
 CANT_SAVE_MESSAGE = "Kan inte spara meddelande"
 CANT_SEND_MESSAGE = "Kan inte skicka meddelande"
 INVALID_RECIPIENTS = "Ogiltig mottagare"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Kan inte skapa mapp"
 CANT_RENAME_FOLDER = "Kan inte byta namn på mapp"
 CANT_DELETE_FOLDER = "Kan inte ta bort mapp"
@@ -628,15 +662,12 @@ BACK_LINK = "Ladda om"
 DOMAIN_LIST_DESC = "Lista över domän(er) som webbmailen har åtkomst till."
 PHP_EXSTENSIONS_ERROR_DESC = "Erfodrade PHP-tillägg finns inte i PHP konfigurationen!"
 PHP_VERSION_ERROR_DESC = "Din PHP version (%VERSION%) uppfyller inte kravet på 5.3.0!"
-
 NO_SCRIPT_TITLE = "JavaScript krävs för denna applikation."
 NO_SCRIPT_DESC = "JavaScript är inte tillgängligt i webb läsaren.
 Aktivera JavaScript stöd och försök igen."
-
 NO_COOKIE_TITLE = "Kakstöd krävs för denna applikation."
 NO_COOKIE_DESC = "Kakstöd är inte tillgängligt i webbläsaren.
 Aktivera kakstöd och försök igen."
-
 BAD_BROWSER_TITLE = "Webbläsaren är för gammal."
 BAD_BROWSER_DESC = "För att använda funktioner i denna applikation,
-ladda ner och installera någon av följande webbläsare:"
+ladda ner och installera någon av följande webbläsare:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini
index 5680f3e5e..34920a4cd 100644
--- a/rainloop/v/0.0.0/langs/tr.ini
+++ b/rainloop/v/0.0.0/langs/tr.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "E-Posta"
 LABEL_LOGIN = "Giriş"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "E-Posta"
 LABEL_PHONE = "Telefon"
 LABEL_WEB = "Web"
 LABEL_BIRTHDAY = "Doğum Günü"
-LABEL_TAGS = "Etiketler"
 LINK_ADD_EMAIL = "Bir e-posta adresi ekleyin"
 LINK_ADD_PHONE = "Bir telefon numarası ekleyin"
 LINK_BIRTHDAY = "Doğrum Günü"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "2-Basamaklı doğrulama testi"
 LABEL_CODE = "Kod"
 BUTTON_TEST = "Test"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Sistem klasörü seç"
 SELECT_CHOOSE_ONE = "Birini seçin"
@@ -319,16 +356,11 @@ LABEL_TRASH = "Çöğ"
 LABEL_ARCHIVE = "Arşiv"
 BUTTON_CANCEL = "Vazgeç"
 BUTTON_CLOSE = "Kapat"
-
 NOTIFICATION_SENT = "Herhangi bir sistem gönderilen klasörü seçmediniz normalde mesaj gönderildikten sonra \"Gönderilen\"'ler klasörüne kaydedilir
 Eğer gönderilenlerin kaydedilmesini istemiyorsanız lütfen ayarlardan \"Kullanma\" seçeneğini seçin."
-
 NOTIFICATION_DRAFTS = "Herhangi bir sistem taslak klasörü seçmediniz.\"Taslak\" klasörü otomatik mesajınızı kaydeder"
-
 NOTIFICATION_SPAM = "Herhangi bir sistem spam klasörü seçmediniz.\"Spam\" klasörü spam iletileri barındırır."
-
 NOTIFICATION_TRASH = "Herhangi bir sistem çöp kutusu klasörü seçmediniz normalde mesaj silindikten sonra \"Çöp Kutusu\" klasörüne kaydedilir"
-
 NOTIFICATION_ARCHIVE = "Herhangi bir sistem arşiv klasörü seçmediniz."
 
 [TITLES]
@@ -368,6 +400,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Şifre"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Geri"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Kimlik"
 LABEL_DISPLAY_NAME = "İsim"
@@ -519,7 +568,6 @@ LABEL_REPLY_ALL = "Tümünü Yanıtla"
 LABEL_FORWARD = "Yönlendir"
 LABEL_FORWARD_MULTIPLY = "Yönlendir (çoklu)"
 LABEL_HELP = "Yardım"
-
 LABEL_CHECK_ALL = "Tüm mesajları seç"
 LABEL_ARCHIVE = "Arşiv"
 LABEL_DELETE = "Sil"
@@ -533,14 +581,12 @@ LABEL_FULLSCREEN_ENTER = "Tam Ekran (Önizleme bölmesi düzeni)"
 LABEL_VIEW_MESSAGE_ENTER = "Mesaj görünümü (Önizleme bölmesi taslağı bulunamadı)"
 LABEL_SWITCH_TO_MESSAGE = "Görünen ile seçilen mesajı değiştir"
 LABEL_SWITCH_TO_FOLDER_LIST = "Görüntülen ile klasör listesini değiştir"
-
 LABEL_FULLSCREEN_TOGGLE = "Tam ekran modunu aç kapat"
 LABEL_BLOCKQUOTES_TOGGLE = "Alıntılanan metni aç kapat"
 LABEL_PRINT = "Yazdır"
 LABEL_EXIT_FULLSCREEN = "Tam ekran modundan çık"
 LABEL_CLOSE_MESSAGE = "Mesajı kapat (önizleme bölmedüzen taslağı bulunamadı)"
 LABEL_SWITCH_TO_LIST = "Görüntülenen'den mesaj listesine geri dön"
-
 LABEL_OPEN_COMPOSE_POPUP = "Yazma pencresini popup olarak aç"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Kimlik açılır pencresini aç"
 LABEL_SAVE_MESSAGE = "Mesajı Kaydet"
@@ -549,9 +595,9 @@ LABEL_CLOSE_COMPOSE = "Oluşturulanı Kapat"
 
 [PGP_NOTIFICATIONS]
 NO_PUBLIC_KEYS_FOUND = "Public key bulunamadı"
-NO_PUBLIC_KEYS_FOUND_FOR = "Public key bulunamadı "%EMAIL%""
+NO_PUBLIC_KEYS_FOUND_FOR = "Public key bulunamadı %EMAIL%"
 NO_PRIVATE_KEY_FOUND = "Private key bulunamadı"
-NO_PRIVATE_KEY_FOUND_FOR = "Private key bulunamadı "%EMAIL%""
+NO_PRIVATE_KEY_FOUND_FOR = "Private key bulunamadı %EMAIL%"
 UNVERIFIRED_SIGNATURE = "Doğrulanmamış imza"
 DECRYPTION_ERROR = "OpenPGP çözme hatası"
 GOOD_SIGNATURE = "Geçerli imza %USER%"
@@ -585,6 +631,8 @@ CANT_MOVE_MESSAGE = "Mesaj taşınamadı"
 CANT_SAVE_MESSAGE = "Mesaj kaydedilemedi"
 CANT_SEND_MESSAGE = "Mesaj gönderilemedi"
 INVALID_RECIPIENTS = "Geçersiz alıcılar"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Klasör oluşturulamadı"
 CANT_RENAME_FOLDER = "Klasör oluşturulamadı"
 CANT_DELETE_FOLDER = "Klasör silimedi"
@@ -612,15 +660,12 @@ BACK_LINK = "Yenile"
 DOMAIN_LIST_DESC = "Alanadı webmail listesi erişime izini."
 PHP_EXSTENSIONS_ERROR_DESC = "Gerekli PHP eklentileri PHP yapılandırmasında mevcut değildir!"
 PHP_VERSION_ERROR_DESC = "PHP sürümünüz (%VERSION%) en az php 5.3.0 sürümü gerekli!"
-
 NO_SCRIPT_TITLE = "JavaScript bu uygulama için gereklidir."
 NO_SCRIPT_DESC = "JavaScript desteği tarayıcınızda mevcut değil.
 Tarayıcı ayarlarında JavaScript desteğini etkinleştirin ve yeniden deneyin."
-
 NO_COOKIE_TITLE = "Çerezler desteği bu uygulama için gerekli."
 NO_COOKIE_DESC = "Çerezler destek tarayıcınızda mevcut değil.
 Tarayıcı ayarlarında Cookie desteği etkinleştirin ve yeniden deneyin."
-
 BAD_BROWSER_TITLE = "Tarayıcınız çok eski."
 BAD_BROWSER_DESC = "Uygulamanın tüm özelliklerini kullanmak için,
 Bu tarayıcılardan birini indirmek ve yükleyin:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini
index 251c6100a..dd1dc5a9c 100644
--- a/rainloop/v/0.0.0/langs/ua.ini
+++ b/rainloop/v/0.0.0/langs/ua.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "Пошта"
 LABEL_LOGIN = "Логін"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "Тест двофакторної верифікації"
 LABEL_CODE = "Код"
 BUTTON_TEST = "Тест"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "Виберіть системні теки"
 SELECT_CHOOSE_ONE = "Ще не вибрано"
@@ -318,18 +356,13 @@ LABEL_TRASH = "Видалені"
 LABEL_ARCHIVE = "Архів"
 BUTTON_CANCEL = "Відмінити"
 BUTTON_CLOSE = "Закрити"
-
 NOTIFICATION_SENT = "Ви ще не обрали системну теку \"Вихідні\", в яку складаються всі повідомлення післе надсилання.
 Якщо ви не хочете зберігати вихідні листи, будь ласка, выберіть пункт \"Не використовувати\"."
-
 NOTIFICATION_DRAFTS = "Ви ще не обрали системну теку \"Чорновики\", в яку складаються всі збережені повідомлення."
-
 NOTIFICATION_SPAM = "Ви ще не обрали системну теку \"Спам\", в яку складаються всі спам повідомлення.
 Якщо ви не хочете видаляти листи одразу, будь ласка, выберіть пункт \"Не використовувати\"."
-
 NOTIFICATION_TRASH = "Ви ще не обрали системну теку \"Удаленные\", в яку складаються всі повідомлення після видалення.
 Якщо ви не хочете видаляти листи одразу, будь ласка, выберіть пункт \"Не використовувати\"."
-
 NOTIFICATION_ARCHIVE = "Ви ще не обрали системну теку \"Архив\", в яку складаються всі повідомлення після архівації."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "Пароль"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "Назад"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "Налаштування профілю"
 LABEL_DISPLAY_NAME = "Ім'я"
@@ -514,14 +564,12 @@ TAB_MAILBOX = "Пошта"
 TAB_MESSAGE_LIST = "Список повідомлень"
 TAB_MESSAGE_VIEW = "Перегляд повідомлень"
 TAB_COMPOSE = "Написанні повідомлення"
-
 LABEL_OPEN_USER_DROPDOWN = "Відкрити випадаючий список користувача"
 LABEL_REPLY = "Відповісти"
 LABEL_REPLY_ALL = "Відповісти всім"
 LABEL_FORWARD = "Переслати"
 LABEL_FORWARD_MULTIPLY = "Переслати всі вибрані повідомлення"
 LABEL_HELP = "Допомога"
-
 LABEL_CHECK_ALL = "Вибрати всі повідомлення"
 LABEL_ARCHIVE = "Архівувати"
 LABEL_DELETE = "Видалити"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Повноекранний режим"
 LABEL_VIEW_MESSAGE_ENTER = "Перегляд повідомлення"
 LABEL_SWITCH_TO_MESSAGE = "Переключити фокус на вибране повідомлення"
 LABEL_SWITCH_TO_FOLDER_LIST = "Переключити фокус на список тек"
-
 LABEL_FULLSCREEN_TOGGLE = "Переключити повноекранний режим"
 LABEL_BLOCKQUOTES_TOGGLE = "Перемикання видимості цитат у листі"
 LABEL_PRINT = "Надрукувати"
 LABEL_EXIT_FULLSCREEN = "Вийти з повноекранного режиму"
 LABEL_CLOSE_MESSAGE = "Закрити повідомлення"
 LABEL_SWITCH_TO_LIST = "Переключити фокус на список листів"
-
 LABEL_OPEN_COMPOSE_POPUP = "Написати листа"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Вибрати відправника"
 LABEL_SAVE_MESSAGE = "Зберегти повідомлення"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "Не можу перемістити листа"
 CANT_SAVE_MESSAGE = "Не можу зберегти листа"
 CANT_SEND_MESSAGE = "Не можу відправити листа"
 INVALID_RECIPIENTS = "Перевірити правильність вводу всіх адрес."
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "Не можу створити теку"
 CANT_RENAME_FOLDER = "Не можу перейменувати теку"
 CANT_DELETE_FOLDER = "Не можу видалити теку"
@@ -614,15 +662,12 @@ BACK_LINK = "Оновити"
 DOMAIN_LIST_DESC = "Список доменів, до яких дозволено доступ через веб пошту."
 PHP_EXSTENSIONS_ERROR_DESC = "Необхідні розширення PHP не встановлені на вашому сервері!"
 PHP_VERSION_ERROR_DESC = "Ваша версія PHP (%VERSION%) нижче потрібної 5.3.0!"
-
 NO_SCRIPT_TITLE = "Для роботи додатку необхідний JavaScript."
 NO_SCRIPT_DESC = "Здається, JavaScript або не підтримується вашим браузером, або вимкнений.
 Увімкніть JavaScript, змінив налаштівання браузера, і спробуйте знову."
-
 NO_COOKIE_TITLE = "Для роботи додатку необхідні Cookie."
 NO_COOKIE_DESC = "Здається, Cookie або не підтримуються вашим браузером, або вимкнені.
 Увімкніть Cookie, змінив налаштівання браузера, і спробуйте знову."
-
 BAD_BROWSER_TITLE = "Ваш браузер застарів."
 BAD_BROWSER_DESC = "Щоб використовувати всі можливості додатку,
-завантажте і встановіть один з цих браузерів:"
+завантажте і встановіть один з цих браузерів:"
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini
index 679ba6e7d..5c57f45df 100644
--- a/rainloop/v/0.0.0/langs/zh-cn.ini
+++ b/rainloop/v/0.0.0/langs/zh-cn.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "邮件"
 LABEL_LOGIN = "登陆"
@@ -307,6 +308,43 @@ TITLE_TEST_CODE = "两步验证测试"
 LABEL_CODE = "代码"
 BUTTON_TEST = "测试"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "选择系统文件夹"
 SELECT_CHOOSE_ONE = "选择一个"
@@ -318,18 +356,13 @@ LABEL_TRASH = "已删除邮件"
 LABEL_ARCHIVE = "存档"
 BUTTON_CANCEL = "取消"
 BUTTON_CLOSE = "关闭"
-
 NOTIFICATION_SENT = "您没有选择 已发邮件 文件夹来存储已发送邮件。
 如果您不希望保存已发邮件，请选择 不使用 选项。"
-
 NOTIFICATION_DRAFTS = "您没有选择 草稿 文件夹来存储邮件草稿。"
-
 NOTIFICATION_SPAM = "您没有选择 垃圾邮件 文件夹来存储垃圾邮件。
 如果您希望永久删除邮件，请选择 不使用 选项。"
-
 NOTIFICATION_TRASH = "您没有选择 已删除邮件 文件夹来存储垃圾邮件。
 如果您希望永久删除邮件，请选择 不使用 选项。"
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -369,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "密码"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "返回"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "签名"
 LABEL_DISPLAY_NAME = "名称"
@@ -520,7 +570,6 @@ LABEL_REPLY_ALL = "回复所有"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "帮助"
-
 LABEL_CHECK_ALL = "检查所有消息"
 LABEL_ARCHIVE = "存档"
 LABEL_DELETE = "删除"
@@ -534,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -586,6 +633,8 @@ CANT_MOVE_MESSAGE = "无法移动邮件"
 CANT_SAVE_MESSAGE = "无法保存邮件"
 CANT_SEND_MESSAGE = "无法发送邮件"
 INVALID_RECIPIENTS = "无效接收人"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "无法创建文件夹"
 CANT_RENAME_FOLDER = "无法重命名文件夹"
 CANT_DELETE_FOLDER = "无法删除文件夹"
@@ -613,15 +662,12 @@ BACK_LINK = "重新加载"
 DOMAIN_LIST_DESC = "可以通过webmail访问的域列表"
 PHP_EXSTENSIONS_ERROR_DESC = "需要的PHP扩展未配置！"
 PHP_VERSION_ERROR_DESC = "您的PHP版本 (%VERSION%) 低于所需的 5.3.0！"
-
 NO_SCRIPT_TITLE = "JavaScript 需要启用！"
 NO_SCRIPT_DESC = "您的浏览器不支持JavaScript。
 请启用浏览器的JavaScript支持并重试。"
-
 NO_COOKIE_TITLE = "Cookies 需要启用！"
 NO_COOKIE_DESC = "您的浏览器不支持Cookies。
 请启用浏览器的Cookies支持并重试。"
-
 BAD_BROWSER_TITLE = "您的浏览器过时了"
 BAD_BROWSER_DESC = "为了使用所有特性，
-下载并安装其中一款浏览器："
+下载并安装其中一款浏览器："
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini
index c36959ce4..a65b4b66d 100644
--- a/rainloop/v/0.0.0/langs/zh-tw.ini
+++ b/rainloop/v/0.0.0/langs/zh-tw.ini
@@ -1,3 +1,4 @@
+
 [LOGIN]
 LABEL_EMAIL = "郵件"
 LABEL_LOGIN = "登錄"
@@ -173,7 +174,6 @@ LABEL_EMAIL = "Email"
 LABEL_PHONE = "電話"
 LABEL_WEB = "網站"
 LABEL_BIRTHDAY = "生日"
-LABEL_TAGS = "Tags"
 LINK_ADD_EMAIL = "添加 Email 地址"
 LINK_ADD_PHONE = "添加電話"
 LINK_BIRTHDAY = "生日"
@@ -308,6 +308,43 @@ TITLE_TEST_CODE = "兩步驗證測試"
 LABEL_CODE = "代碼"
 BUTTON_TEST = "測試"
 
+[POPUPS_FILTER]
+TITLE_CREATE_FILTER = "Create a filter?"
+TITLE_EDIT_FILTER = "Update filter?"
+FILTER_NAME = "Name"
+LEGEND_CONDIFIONS = "Conditions"
+LEGEND_ACTIONS = "Actions"
+BUTTON_DONE = "Done"
+BUTTON_ADD_CONDITION = "Add a Condition"
+SELECT_ACTION_NONE = "None"
+SELECT_ACTION_MOVE_TO = "Move to"
+SELECT_ACTION_FORWARD_TO = "Forward to"
+SELECT_ACTION_REJECT = "Reject"
+SELECT_ACTION_VACATION_MESSAGE = "Vacation message"
+SELECT_ACTION_DISCARD = "Discard"
+SELECT_FIELD_FROM = "From"
+SELECT_FIELD_RECIPIENTS = "Recipients (To or CC)"
+SELECT_FIELD_SUBJECT = "Subject"
+SELECT_FIELD_HEADER = "Header"
+SELECT_FIELD_SIZE = "Size"
+SELECT_TYPE_CONTAINS = "Contains"
+SELECT_TYPE_NOT_CONTAINS = "Not Contains"
+SELECT_TYPE_MATCHES = "Matches (* and ? supported)"
+SELECT_TYPE_NOT_MATCHES = "Not Matches (* and ? supported)"
+SELECT_TYPE_REGEXP = "Regexp"
+SELECT_TYPE_NOT_REGEXP = "Not Regexp"
+SELECT_TYPE_EQUAL_TO = "Equal To"
+SELECT_TYPE_NOT_EQUAL_TO = "Not Equal To"
+SELECT_MATCH_ANY = "Matching any of the following rules"
+SELECT_MATCH_ALL = "Matching all of the following rules"
+MARK_AS_READ_LABEL = "Mark as read"
+KEEP_LABEL = "Keep"
+EMAIL_LABEL = "Email"
+VACATION_SUBJECT_LABEL = "Subject (optional)"
+VACATION_MESSAGE_LABEL = "Message"
+REJECT_MESSAGE_LABEL = "Reject message"
+ALL_INCOMING_MESSAGES_DESC = "All incoming messages"
+
 [POPUPS_SYSTEM_FOLDERS]
 TITLE_SYSTEM_FOLDERS = "選擇系統資料夾"
 SELECT_CHOOSE_ONE = "選擇一個"
@@ -319,18 +356,13 @@ LABEL_TRASH = "已刪除郵件"
 LABEL_ARCHIVE = "存檔"
 BUTTON_CANCEL = "取消"
 BUTTON_CLOSE = "關閉"
-
 NOTIFICATION_SENT = "您沒有選擇 已發郵件 資料夾來存儲已發送郵件。
 如果您不希望保存已發郵件，請選擇 不使用 選項。"
-
 NOTIFICATION_DRAFTS = "您沒有選擇 草稿 資料夾來存儲郵件草稿。"
-
 NOTIFICATION_SPAM = "您沒有選擇 垃圾郵件 資料夾來存儲垃圾郵件。
 如果您希望永久刪除郵件，請選擇 不使用 選項。"
-
 NOTIFICATION_TRASH = "您沒有選擇 已刪除郵件 資料夾來存儲垃圾郵件。
 如果您希望永久刪除郵件，請選擇 不使用 選項。"
-
 NOTIFICATION_ARCHIVE = "You haven't selected \"Archive\" system folder achived messages are placed to."
 
 [TITLES]
@@ -370,6 +402,23 @@ LABEL_CHANGE_PASSWORD_NAME = "密碼"
 LABEL_OPEN_PGP_NAME = "OpenPGP"
 BUTTON_BACK = "返回"
 
+[SETTINGS_FILTERS]
+LEGEND_FILTERS = "Filters"
+BUTTON_SAVE = "Save"
+BUTTON_ADD_FILTER = "Add a Filter"
+BUTTON_DELETE = "Delete"
+BUTTON_RAW_SCRIPT = "Use Custom User Script"
+SUBNAME_NONE = "None"
+SUBNAME_MOVE_TO = "Move to \"%FOLDER%\""
+SUBNAME_FORWARD_TO = "Forward to \"%EMAIL%\""
+SUBNAME_REJECT = "Reject"
+SUBNAME_VACATION_MESSAGE = "Vacation message"
+SUBNAME_DISCARD = "Discard"
+CAPABILITY_LABEL = "Capability"
+LOADING_PROCESS = "Updating filter list"
+DELETING_ASK = "Are you sure?"
+CHACHES_NEED_TO_BE_SAVED_DESC = "These changes need to be saved to the server."
+
 [SETTINGS_IDENTITY]
 LEGEND_IDENTITY = "簽名"
 LABEL_DISPLAY_NAME = "名稱"
@@ -521,7 +570,6 @@ LABEL_REPLY_ALL = "回復所有"
 LABEL_FORWARD = "Forward"
 LABEL_FORWARD_MULTIPLY = "Forward (multiply)"
 LABEL_HELP = "幫助"
-
 LABEL_CHECK_ALL = "檢查所有消息"
 LABEL_ARCHIVE = "存檔"
 LABEL_DELETE = "刪除"
@@ -535,14 +583,12 @@ LABEL_FULLSCREEN_ENTER = "Fullscreen (Preview pane layout)"
 LABEL_VIEW_MESSAGE_ENTER = "View message (No preview pane layout)"
 LABEL_SWITCH_TO_MESSAGE = "Switch focus to selected message"
 LABEL_SWITCH_TO_FOLDER_LIST = "Switch focus to folder list"
-
 LABEL_FULLSCREEN_TOGGLE = "Toggle fullscreen mode"
 LABEL_BLOCKQUOTES_TOGGLE = "Toggle message blockquotes"
 LABEL_PRINT = "Print"
 LABEL_EXIT_FULLSCREEN = "Exit fullscreen mode"
 LABEL_CLOSE_MESSAGE = "Close message (No preview pane layout)"
 LABEL_SWITCH_TO_LIST = "Switch focus back to message list"
-
 LABEL_OPEN_COMPOSE_POPUP = "Open compose popup"
 LABEL_OPEN_IDENTITIES_DROPDOWN = "Open identities dropdown"
 LABEL_SAVE_MESSAGE = "Save message"
@@ -587,6 +633,8 @@ CANT_MOVE_MESSAGE = "無法移動郵件"
 CANT_SAVE_MESSAGE = "無法保存郵件"
 CANT_SEND_MESSAGE = "無法發送郵件"
 INVALID_RECIPIENTS = "無效接收人"
+CANT_SAVE_FILTERS = "Can't save filters"
+FILTERS_ARE_NOT_CORRECT = "Filters are not correct"
 CANT_CREATE_FOLDER = "無法創建資料夾"
 CANT_RENAME_FOLDER = "無法重命名資料夾"
 CANT_DELETE_FOLDER = "無法刪除資料夾"
@@ -614,15 +662,12 @@ BACK_LINK = "重新載入"
 DOMAIN_LIST_DESC = "可以通過webmail訪問的域列表"
 PHP_EXSTENSIONS_ERROR_DESC = "需要的PHP擴展未配置！"
 PHP_VERSION_ERROR_DESC = "您的PHP版本 (%VERSION%) 低於所需的 5.3.0！"
-
 NO_SCRIPT_TITLE = "JavaScript 需要啟用！"
 NO_SCRIPT_DESC = "您的瀏覽器不支持JavaScript。
 請啟用瀏覽器的JavaScript支持並重試。"
-
 NO_COOKIE_TITLE = "Cookies 需要啟用！"
 NO_COOKIE_DESC = "您的瀏覽器不支持Cookies。
 請啟用瀏覽器的Cookies支持並重試。"
-
 BAD_BROWSER_TITLE = "您的瀏覽器過時了"
 BAD_BROWSER_DESC = "為了使用所有特性，
-下載並安裝其中一款瀏覽器："
+下載並安裝其中一款瀏覽器："
\ No newline at end of file