diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less
index 0098c4dff..103f6bf4b 100644
--- a/dev/Styles/Contacts.less
+++ b/dev/Styles/Contacts.less
@@ -74,6 +74,7 @@
 
 			.footer-pager {
 				padding: 8px 10px 0 0;
+				text-align: right;
 			}
 		}
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
index c125dd43c..ef5d6ea56 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html
@@ -1,21 +1,21 @@
 <div class="modal fade b-shortcuts-content" data-bind="modal: modalVisibility">
 	<div class="modal-header">
 		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
-		<h3 class="i18n" data-i18n="SHORTCUTS_HELP/LEGEND_SHORTCUTS_HELP"></h3>
+		<h3 data-i18n="SHORTCUTS_HELP/LEGEND_SHORTCUTS_HELP"></h3>
 	</div>
 	<div class="modal-body">
 		<ul class="nav nav-tabs">
 			<li class="active">
-				<a class="i18n" data-i18n="SHORTCUTS_HELP/TAB_MAILBOX" href="#mailbox-shortcuts-id" data-toggle="tab"></a>
+				<a data-i18n="SHORTCUTS_HELP/TAB_MAILBOX" href="#mailbox-shortcuts-id" data-toggle="tab"></a>
 			</li>
 			<li>
-				<a class="i18n" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_LIST" href="#message-list-shortcuts-id" data-toggle="tab"></a>
+				<a data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_LIST" href="#message-list-shortcuts-id" data-toggle="tab"></a>
 			</li>
 			<li>
-				<a class="i18n" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_VIEW" href="#message-view-shortcuts-id" data-toggle="tab"></a>
+				<a data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_VIEW" href="#message-view-shortcuts-id" data-toggle="tab"></a>
 			</li>
 			<li>
-				<a class="i18n" data-i18n="SHORTCUTS_HELP/TAB_COMPOSE" href="#compose-shortcuts-id" data-toggle="tab"></a>
+				<a data-i18n="SHORTCUTS_HELP/TAB_COMPOSE" href="#compose-shortcuts-id" data-toggle="tab"></a>
 			</li>
 		</ul>
 		<br  />
@@ -24,12 +24,12 @@
 
 				<table class="table table-striped table-bordered">
 				<tbody>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_USER_DROPDOWN"></td><td>M, Menu</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_REPLY"></td><td>R, Reply</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_REPLY_ALL"></td><td>A, Shift + Reply</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_FORWARD"></td><td>F, Fwd</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_FORWARD_MULTIPLY"></td><td>Shift + F, Shift + Fwd</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_HELP"></td><td>F1, Help</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_OPEN_USER_DROPDOWN"></td><td>M, Menu</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_REPLY"></td><td>R, Reply</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_REPLY_ALL"></td><td>A, Shift + Reply</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_FORWARD"></td><td>F, Fwd</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_FORWARD_MULTIPLY"></td><td>Shift + F, Shift + Fwd</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_HELP"></td><td>F1, Help</td></tr>
 				</tbody>
 				</table>
 
@@ -38,19 +38,19 @@
 
 				<table class="table table-striped table-bordered">
 				<tbody>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_CHECK_ALL"></td><td>Ctrl + A, ⌘ + A</td></tr>
-					<tr><td class="i18n" data-i18n="GLOBAL/TO_ARCHIVE"></td><td>Z</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_DELETE"></td><td>Delete, Shift + Delete</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_THREAD"></td><td>T</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_MOVE"></td><td>Insert</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_READ"></td><td>Q</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_UNREAD"></td><td>U</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_IMPORTANT"></td><td>I</td></tr>
-					<tr><td class="i18n" data-i18n="GLOBAL/SEARCH"></td><td>/</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_ENTER"></td><td>Enter</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_VIEW_MESSAGE_ENTER"></td><td>Enter</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_MESSAGE"></td><td>→, Tab</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_FOLDER_LIST"></td><td>←, Shift + Tab</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_CHECK_ALL"></td><td>Ctrl + A, ⌘ + A</td></tr>
+					<tr><td data-i18n="GLOBAL/TO_ARCHIVE"></td><td>Z</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_DELETE"></td><td>Delete, Shift + Delete</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_OPEN_THREAD"></td><td>T</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_MOVE"></td><td>Insert</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_READ"></td><td>Q</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_UNREAD"></td><td>U</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_IMPORTANT"></td><td>I</td></tr>
+					<tr><td data-i18n="GLOBAL/SEARCH"></td><td>/</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_ENTER"></td><td>Enter</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_VIEW_MESSAGE_ENTER"></td><td>Enter</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_MESSAGE"></td><td>→, Tab</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_FOLDER_LIST"></td><td>←, Shift + Tab</td></tr>
 				</tbody>
 				</table>
 
@@ -59,12 +59,12 @@
 
 				<table class="table table-striped table-bordered">
 				<tbody>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_TOGGLE"></td><td>Enter, Open</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_BLOCKQUOTES_TOGGLE"></td><td>B</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_PRINT"></td><td>Ctrl + P, ⌘ + P</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_EXIT_FULLSCREEN"></td><td>Esc, Close</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_MESSAGE"></td><td>Esc, Close</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_LIST"></td><td>Tab, Shift + Tab, Esc</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_TOGGLE"></td><td>Enter, Open</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_BLOCKQUOTES_TOGGLE"></td><td>B</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_PRINT"></td><td>Ctrl + P, ⌘ + P</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_EXIT_FULLSCREEN"></td><td>Esc, Close</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_MESSAGE"></td><td>Esc, Close</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_LIST"></td><td>Tab, Shift + Tab, Esc</td></tr>
 				</tbody>
 				</table>
 
@@ -73,12 +73,12 @@
 
 				<table class="table table-striped table-bordered">
 				<tbody>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_COMPOSE_POPUP"></td><td>W, C, New</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_OPEN_IDENTITIES_DROPDOWN"></td><td>M, Menu, Ctrl + M, ⌘ + M</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SAVE_MESSAGE"></td><td>Ctrl + S, ⌘ + S, Save</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_SEND_MESSAGE"></td><td>Send, Ctrl + Enter, ⌘ + Enter</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_MINIMIZE_COMPOSE_POPUP"></td><td>Esc, Close</td></tr>
-					<tr><td class="i18n" data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_COMPOSE"></td><td>Shift + Esc, Shift + Close</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_OPEN_COMPOSE_POPUP"></td><td>W, C, New</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_OPEN_IDENTITIES_DROPDOWN"></td><td>M, Menu, Ctrl + M, ⌘ + M</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_SAVE_MESSAGE"></td><td>Ctrl + S, ⌘ + S, Save</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_SEND_MESSAGE"></td><td>Send, Ctrl + Enter, ⌘ + Enter</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_MINIMIZE_COMPOSE_POPUP"></td><td>Esc, Close</td></tr>
+					<tr><td data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_COMPOSE"></td><td>Shift + Esc, Shift + Close</td></tr>
 				</tbody>
 				</table>
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
index 537be61b0..65f211ec5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/PopupsLanguages.html
@@ -2,7 +2,7 @@
 	<div class="modal-header">
 		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3>
-			<span class="i18n" data-i18n="POPUPS_LANGUAGES/TITLE_LANGUAGES"></span>
+			<span data-i18n="POPUPS_LANGUAGES/TITLE_LANGUAGES"></span>
 		</h3>
 	</div>
 	<div class="modal-body" style="min-height: 150px;">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
index c13d0cd04..c7e6caaa3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
@@ -4,6 +4,6 @@
 		'icon-checkbox-unchecked': !value()
 	}"></i>
 <!-- ko if: labeled -->
-	<span class="sub-label i18n" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
+	<span class="sub-label" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
 <!-- /ko -->
 </span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html b/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
index a9cc16d21..59cc63d20 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
@@ -5,6 +5,6 @@
 			'box': animationBox, 'checkmark': animationCheckmark}"></div>
 	</div>
 <!-- ko if: labeled -->
-	<span class="sub-label i18n" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
+	<span class="sub-label" data-bind="attr: {'data-i18n': label}, css: {'i18n-animation': labelAnimated}"></span>
 <!-- /ko -->
 </span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Input.html b/snappymail/v/0.0.0/app/templates/Views/Components/Input.html
index 8552ae56d..96ece3696 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Input.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Input.html
@@ -1,8 +1,8 @@
-<input class="i18n" type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 	data-bind="textInput: value, attr: {'placeholder': placeholder}, enable: enable, css: className" />
 <!-- ko if: labeled -->
 	&nbsp;
-	<span class="i18n" data-bind="attr: {'data-i18n': label}"></span>
+	<span data-bind="attr: {'data-i18n': label}"></span>
 <!-- /ko -->
 <!-- ko if: triggered -->
 	<span data-bind="saveTrigger: trigger"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Select.html b/snappymail/v/0.0.0/app/templates/Views/Components/Select.html
index 46cc72488..59c1d8d33 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Select.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Select.html
@@ -1,13 +1,13 @@
 <div class="e-component e-select inline">
 	<!-- ko if: preLabeled -->
-	<span class="i18n" data-bind="attr: {'data-i18n': preLabel}"></span>
+	<span data-bind="attr: {'data-i18n': preLabel}"></span>
 	&nbsp;&nbsp;
 	<!-- /ko -->
 	<select data-bind="options: options, value: value, enable: enable, optionsText: optionsText, optionsValue: optionsValue,
 		optionsCaption: optionsCaption, css: className, optionsAfterRender: defaultOptionsAfterRender"></select>
 	<!-- ko if: labeled -->
 	&nbsp;
-	<span class="i18n" data-bind="attr: {'data-i18n': label}"></span>
+	<span data-bind="attr: {'data-i18n': label}"></span>
 	<!-- /ko -->
 	<!-- ko if: triggered -->
 	<span data-bind="saveTrigger: trigger"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html b/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html
index 0467fa686..66fea7ef3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html
@@ -1,4 +1,4 @@
-<textarea class="i18n" rows="5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+<textarea rows="5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 	data-bind="value: value, enable: enable, attr: { 'placeholder': placeholder, 'rows': rows, 'spellcheck': spellcheck ? 'true' : 'false' }, css: className"></textarea>
 <!-- ko if: triggered -->
 	<span data-bind="saveTrigger: trigger"></span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index b66c7737a..c7e537cc9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -96,14 +96,14 @@
 						style="text-align: center">
 						<a href="#" target="_blank" class="g-ui-link"
 							data-bind="attr: {href: forgotPasswordLinkUrl}, css: {'pull-right': '' !== registrationLinkUrl}"><span
-								class="i18n" data-i18n="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>
+								data-i18n="LOGIN/LABEL_FORGOT_PASSWORD"></span></a>
 					</div>
 					&nbsp;
 					<div class="registration-link pull-right"
 						data-bind="visible: '' !== registrationLinkUrl" style="text-align: center">
 						<a href="#" target="_blank" class="g-ui-link"
 							data-bind="attr: {href: registrationLinkUrl}, css: {'pull-left': '' !== forgotPasswordLinkUrl}"><span
-								class="i18n" data-i18n="LOGIN/LABEL_REGISTRATION"></span></a>
+								data-i18n="LOGIN/LABEL_REGISTRATION"></span></a>
 					</div>
 				</div>
 			</form>
@@ -113,14 +113,14 @@
 				<i class="fontastic">📱</i>
 				&nbsp;
 				<a href="./?/MobileVersion/" tabindex="-1">
-					<span class="i18n" data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></span>
+					<span data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></span>
 				</a>
 			</span>
 			<span data-bind="visible: mobile">
 				<i class="fontastic">💻</i>
 				&nbsp;
 				<a href="./?/DesktopVersion/" tabindex="-1">
-					<span class="i18n" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></span>
+					<span data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></span>
 				</a>
 			</span>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index 1438e6747..0ed6fc27d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -75,50 +75,50 @@
 							<li class="e-item" role="presentation" data-bind="click: listUnsetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_UNSET_SEEN"></span>
+									<span data-i18n="MESSAGE_LIST/MENU_UNSET_SEEN"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_SEEN"></span>
+									<span data-i18n="MESSAGE_LIST/MENU_SET_SEEN"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_FLAG"></span>
+									<span data-i18n="MESSAGE_LIST/MENU_SET_FLAG"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listUnsetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_UNSET_FLAG"></span>
+									<span data-i18n="MESSAGE_LIST/MENU_UNSET_FLAG"></span>
 								</a>
 							</li>
 							<li class="e-item" role="presentation" data-bind="click: listSetAllSeen, css: {'disabled': !hasMessages()}">
 								<a class="e-link menuitem" href="#" tabindex="-1">
 									<i class="icon-none"></i>
-									<span class="i18n" data-i18n="MESSAGE_LIST/MENU_SET_ALL_SEEN"></span>
+									<span data-i18n="MESSAGE_LIST/MENU_SET_ALL_SEEN"></span>
 								</a>
 							</li>
 						</div>
 						<li class="e-item dividerbar" role="presentation" data-bind="visible: allowComposer, command: multyForwardCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">↞</i>
-								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_MULTY_FORWARD"></span>
+								<span data-i18n="MESSAGE_LIST/BUTTON_MULTY_FORWARD"></span>
 							</a>
 						</li>
 						<li class="e-item dividerbar" role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">🗑</i>
-								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></span>
+								<span data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></span>
 							</a>
 						</li>
 						<li class="e-item" role="presentation" data-bind="visible: allowDangerousActions, command: clearCommand">
 							<a class="e-link menuitem" href="#" tabindex="-1">
 								<i class="fontastic">🔥</i>
-								<span class="i18n" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER"></span>
+								<span data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER"></span>
 							</a>
 						</li>
 					</ul>
@@ -145,30 +145,30 @@
 					<div class="content-wrapper">
 						<div class="listThreadUidDesc" data-bind="visible: '' !== messageListEndThreadUid(), click: cancelThreadUid">
 							<i class="icon-left" data-bind="click: cancelThreadUid"></i>
-							<span class="i18n" data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></span>
+							<span data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></span>
 						</div>
 						<div class="listSearchDesc" data-bind="visible: '' !== messageListSearchDesc()">
 							<span data-bind="text: messageListSearchDesc"></span>
 						</div>
 						<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && '' === messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea">
 							<i class="icon-down e-icon"></i>
-							<span class="i18n" data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
+							<span data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
 						</div>
 						<div class="listClear" data-bind="visible: clearListIsVisible()">
-							<span class="g-ui-link i18n" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="command: clearCommand"></span>
+							<span class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="command: clearCommand"></span>
 						</div>
 						<div class="listError" data-bind="visible: !dragOver() && '' !== messageListError()">
 							<span class="error" data-bind="text: messageListError"></span>
 						</div>
 						<div class="listEmptyList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' === messageListSearch()">
-							<span class="i18n" data-i18n="MESSAGE_LIST/EMPTY_LIST"></span>
+							<span data-i18n="MESSAGE_LIST/EMPTY_LIST"></span>
 						</div>
 						<div class="listEmptyListLoading" data-bind="visible: !dragOver() && 0 === messageList().length &&
 							messageListCompleteLoadingThrottle() && '' === messageListError()">
-							<span class="i18n" data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
+							<span data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
 						</div>
 						<div class="listEmptySearchList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' !== messageListSearch()">
-							<span class="i18n" data-i18n="MESSAGE_LIST/EMPTY_SEARCH_LIST"></span>
+							<span data-i18n="MESSAGE_LIST/EMPTY_SEARCH_LIST"></span>
 						</div>
 						<div data-bind="dragmessages: getDragData">
 							<div class="messageListPlace" data-bind="template: { name: messageListItemTemplate(), foreach: messageList }"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index 040b92e8d..358fef8be 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -42,7 +42,7 @@
 					<div class="backdrop-message-wrp">
 						<div class="backdrop-message">
 							<i class="icon-folder" style="padding: 0 7px; font-size: 24px; width: 24px; line-height: 24px;"></i>
-							<span class="i18n" style="vertical-align: middle; padding: 0 7px" data-i18n="MESSAGE/MESSAGE_VIEW_MOVE_DESC"></span>
+							<span style="vertical-align: middle; padding: 0 7px" data-i18n="MESSAGE/MESSAGE_VIEW_MOVE_DESC"></span>
 						</div>
 					</div>
 				</div>
@@ -54,7 +54,7 @@
 				<div class="b-message-view-desc error" data-bind="visible: !message() && '' !== messageError() && !hasCheckedMessages(), text: messageError()">
 				</div>
 
-				<div class="b-message-view-desc" class="i18n" data-i18n="MESSAGE/MESSAGE_VIEW_DESC" data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()">
+				<div class="b-message-view-desc" data-i18n="MESSAGE/MESSAGE_VIEW_DESC" data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()">
 				</div>
 
 				<div class="message-fixed-button-toolbar" data-bind="visible: message">
@@ -81,31 +81,31 @@
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: replyCommand">
 											<i class="fontastic">←</i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_REPLY"></span>
+											<span data-i18n="MESSAGE/BUTTON_REPLY"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: replyAllCommand">
 											<i class="fontastic">↞</i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_REPLY_ALL"></span>
+											<span data-i18n="MESSAGE/BUTTON_REPLY_ALL"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: forwardCommand">
 											<i class="fontastic">→</i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_FORWARD"></span>
+											<span data-i18n="MESSAGE/BUTTON_FORWARD"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: editAsNewCommand">
 											<i class="fontastic">🖉</i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></span>
+											<span data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: forwardAsAttachmentCommand">
 											<i class="fontastic">→</i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_FORWARD_AS_ATTACHMENT"></span>
+											<span data-i18n="MESSAGE/BUTTON_FORWARD_AS_ATTACHMENT"></span>
 										</a>
 									</li>
 								</div>
@@ -113,31 +113,31 @@
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: archiveCommand">
 											<i class="icon-archive"></i>
-											<span class="i18n" data-i18n="GLOBAL/TO_ARCHIVE"></span>
+											<span data-i18n="GLOBAL/TO_ARCHIVE"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && !isSpamFolder() && !isSpamDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: spamCommand">
 											<i class="fontastic">⚠</i>
-											<span class="i18n" data-i18n="GLOBAL/SPAM"></span>
+											<span data-i18n="GLOBAL/SPAM"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && isSpamFolder() && !isSpamDisabled()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: notSpamCommand">
 											<i class="icon-check-mark-circle-two"></i>
-											<span class="i18n" data-i18n="GLOBAL/NOT_SPAM"></span>
+											<span data-i18n="GLOBAL/NOT_SPAM"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: deleteCommand">
 											<i class="fontastic">🗑</i>
-											<span class="i18n" data-i18n="GLOBAL/DELETE"></span>
+											<span data-i18n="GLOBAL/DELETE"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation" data-bind="visible: message() && message().hasUnsubsribeLinks()">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="attr: { href: viewUnsubscribeLink }">
 											<i class="fontastic">✖</i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></span>
+											<span data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></span>
 										</a>
 									</li>
 								</div>
@@ -145,25 +145,25 @@
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="click: function () { if (message()) { message().printMessage(); }} ">
 											<i class="fontastic">🖨</i>
-											<span class="i18n" data-i18n="MESSAGE/MENU_PRINT"></span>
+											<span data-i18n="MESSAGE/MENU_PRINT"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="click: function () { if (message()) { message().viewPopupMessage(); }}">
 											<i class="icon-popup"></i>
-											<span class="i18n" data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
+											<span data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
 										</a>
 									</li>
 									<li class="e-item dividerbar" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="attr: { href: viewViewLink }">
 											<i class="icon-file-code"></i>
-											<span class="i18n" data-i18n="MESSAGE/MENU_VIEW_ORIGINAL"></span>
+											<span data-i18n="MESSAGE/MENU_VIEW_ORIGINAL"></span>
 										</a>
 									</li>
 									<li class="e-item" role="presentation">
 										<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="attr: { href: viewDownloadLink }">
 											<i class="icon-download"></i>
-											<span class="i18n" data-i18n="MESSAGE/MENU_DOWNLOAD_ORIGINAL"></span>
+											<span data-i18n="MESSAGE/MENU_DOWNLOAD_ORIGINAL"></span>
 										</a>
 									</li>
 								</div>
@@ -351,7 +351,7 @@
 												<i class="icon-file-zip" data-bind="visible: !downloadAsZipError(),
 													css: {'icon-file-zip': !downloadAsZipLoading(), 'icon-spinner': downloadAsZipLoading()}"></i>
 												<span class="g-ui-link" data-bind="click: downloadAsZip">
-													<span class="i18n" data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
+													<span data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
 												</span>
 											</span>
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
index f35cff58c..7fbf20215 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAccount.html
@@ -3,8 +3,8 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span data-bind="visible: isNew" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></span>
-				<span data-bind="visible: !isNew()" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></span>
+				<span data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></span>
+				<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -38,9 +38,9 @@
 		<div class="modal-footer">
 			<a class="btn buttonAddAccount" data-bind="command: addAccountCommand">
 				<i data-bind="visible: isNew, css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<span data-bind="visible: isNew" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_ADD_ACCOUNT"></span>
+				<span data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_ADD_ACCOUNT"></span>
 				<i data-bind="visible: !isNew(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<span data-bind="visible: !isNew()" class="i18n" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span>
+				<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html
index 7a737ff43..065ac9709 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAddOpenPgpKey.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/TITLE_IMPORT_OPEN_PGP_KEY"></span>
+				<span data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/TITLE_IMPORT_OPEN_PGP_KEY"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -18,7 +18,7 @@
 			<a class="btn buttonAddAccount" data-bind="command: addOpenPgpKeyCommand">
 				<i class="icon-list-add"></i>
 				&nbsp;&nbsp;
-				<span class="i18n" data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/BUTTON_IMPORT_OPEN_PGP_KEY"></span>
+				<span data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/BUTTON_IMPORT_OPEN_PGP_KEY"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
index d615615d1..798d96a0d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
@@ -2,7 +2,7 @@
 	<div class="modal-header">
 		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3>
-			<span class="i18n" data-i18n="SEARCH/TITLE_ADV"></span>
+			<span data-i18n="SEARCH/TITLE_ADV"></span>
 		</h3>
 	</div>
 	<div class="modal-body">
@@ -12,7 +12,7 @@
 				<div class="span4">
 					<div class="control-group">
 						<label class="control-label">
-							<span class="i18n" data-i18n="GLOBAL/FROM"></span>
+							<span data-i18n="GLOBAL/FROM"></span>
 						</label>
 						<div class="controls">
 							<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -21,7 +21,7 @@
 					</div>
 					<div class="control-group">
 						<label class="control-label">
-							<span class="i18n" data-i18n="GLOBAL/TO"></span>
+							<span data-i18n="GLOBAL/TO"></span>
 						</label>
 						<div class="controls">
 							<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -30,7 +30,7 @@
 					</div>
 					<div class="control-group">
 						<label class="control-label">
-							<span class="i18n" data-i18n="GLOBAL/SUBJECT"></span>
+							<span data-i18n="GLOBAL/SUBJECT"></span>
 						</label>
 						<div class="controls">
 							<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -39,7 +39,7 @@
 					</div>
 					<div class="control-group">
 						<label class="control-label">
-							<span class="i18n" data-i18n="SEARCH/LABEL_ADV_TEXT"></span>
+							<span data-i18n="SEARCH/LABEL_ADV_TEXT"></span>
 						</label>
 						<div class="controls">
 							<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -50,7 +50,7 @@
 				<div class="span4">
 					<div class="control-group">
 						<label class="control-label">
-							<span class="i18n" data-i18n="SEARCH/LABEL_ADV_DATE"></span>
+							<span data-i18n="SEARCH/LABEL_ADV_DATE"></span>
 						</label>
 						<div class="controls">
 							<div data-bind="component: {
@@ -98,7 +98,7 @@
 	<div class="modal-footer">
 		<button type="submit" class="btn buttonAdvSearch" data-bind="command: searchCommand">
 			<i class="fontastic">🔎</i>
-			<span class="i18n" data-i18n="GLOBAL/SEARCH"></span>
+			<span data-i18n="GLOBAL/SEARCH"></span>
 		</a>
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index e0e1b4104..58a61b095 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -23,7 +23,7 @@
 				<div class="e-row" style="height: 40px;">
 					<div class="e-cell e-label">
 						<label class="control-label">
-							<span class="i18n" data-i18n="GLOBAL/FROM"></span>
+							<span data-i18n="GLOBAL/FROM"></span>
 						</label>
 					</div>
 					<div class="e-cell e-value">
@@ -53,25 +53,25 @@
 									<li class="e-item" data-bind="click: function () { requestReadReceipt(!requestReadReceipt()); }">
 										<a class="e-link">
 											<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': requestReadReceipt(), 'icon-checkbox-unchecked': !requestReadReceipt() }"></i>
-											<span class="i18n" data-i18n="COMPOSE/BUTTON_REQUEST_READ_RECEIPT"></span>
+											<span data-i18n="COMPOSE/BUTTON_REQUEST_READ_RECEIPT"></span>
 										</a>
 									</li>
 									<li class="e-item" data-bind="click: function () { requestDsn(!requestDsn()); }">
 										<a class="e-link">
 											<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': requestDsn(), 'icon-checkbox-unchecked': !requestDsn() }"></i>
-											<span class="i18n" data-i18n="COMPOSE/BUTTON_REQUEST_DSN"></span>
+											<span data-i18n="COMPOSE/BUTTON_REQUEST_DSN"></span>
 										</a>
 									</li>
 									<li class="e-item" data-bind="click: function () { markAsImportant(!markAsImportant()); }">
 										<a class="e-link">
 											<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': markAsImportant(), 'icon-checkbox-unchecked': !markAsImportant() }"></i>
-											<span class="i18n" data-i18n="COMPOSE/BUTTON_MARK_AS_IMPORTANT"></span>
+											<span data-i18n="COMPOSE/BUTTON_MARK_AS_IMPORTANT"></span>
 										</a>
 									</li>
 									<li class="e-item dividerbar" data-bind="visible: capaOpenPGP, click: openOpenPgpPopup, css: {'disabled': isHtml()}">
 										<a class="e-link">
 											<i class="fontastic">🔑</i>
-											<span class="i18n" data-i18n="COMPOSE/BUTTON_OPEN_PGP"></span>
+											<span data-i18n="COMPOSE/BUTTON_OPEN_PGP"></span>
 										</a>
 									</li>
 								</ul>
@@ -102,7 +102,7 @@
 				<div class="e-row">
 					<div class="e-cell e-label">
 						<label class="control-label" data-bind="css: {'error-to': emptyToError}">
-							<span class="i18n" data-i18n="GLOBAL/TO"
+							<span data-i18n="GLOBAL/TO"
 								data-bind="tooltipErrorTip: emptyToErrorTooltip"></span>
 						</label>
 					</div>
@@ -112,7 +112,7 @@
 				</div>
 				<div class="e-row cc-row" data-bind="visible: showCc">
 					<div class="e-cell e-label">
-						<span class="i18n" data-i18n="GLOBAL/CC"></span>
+						<span data-i18n="GLOBAL/CC"></span>
 					</div>
 					<div class="e-cell e-value">
 						<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: cc, autoCompleteSource: emailsSource" />
@@ -120,7 +120,7 @@
 				</div>
 				<div class="e-row bcc-row" data-bind="visible: showBcc">
 					<div class="e-cell e-label">
-						<span class="i18n" data-i18n="GLOBAL/BCC"></span>
+						<span data-i18n="GLOBAL/BCC"></span>
 					</div>
 					<div class="e-cell e-value">
 						<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: bcc, autoCompleteSource: emailsSource" />
@@ -128,7 +128,7 @@
 				</div>
 				<div class="e-row reply-to-row" data-bind="visible: showReplyTo">
 					<div class="e-cell e-label">
-						<span class="i18n" data-i18n="GLOBAL/REPLY_TO"></span>
+						<span data-i18n="GLOBAL/REPLY_TO"></span>
 					</div>
 					<div class="e-cell e-value">
 						<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: replyTo, autoCompleteSource: emailsSource" />
@@ -136,7 +136,7 @@
 				</div>
 				<div class="e-row">
 					<div class="e-cell e-label">
-						<span class="i18n" data-i18n="GLOBAL/SUBJECT"></span>
+						<span data-i18n="GLOBAL/SUBJECT"></span>
 					</div>
 					<div class="e-cell e-value">
 						<input type="text" size="70" autocomplete="off" data-bind="textInput: subject" />
@@ -182,11 +182,11 @@
 			<div class="content">
 				<div class="content-wrapper">
 					<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropEnabled() && dragAndDropVisible(), initDom: composeUploaderDropPlace, css: {'dragAndDropOver': dragAndDropOver}">
-						<span class="i18n" data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></span>
+						<span data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></span>
 					</div>
 					<ul class="attachmentList" data-bind="template: { name: 'ComposeAttachment', foreach: attachments }"></ul>
 					<div class="no-attachments-desc" data-bind="visible: 0 === attachments().length">
-						<span class="i18n" data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></span>
+						<span data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></span>
 					</div>
 				</div>
 			</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
index dd962be58..17e148440 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_COMPOSE_OPEN_PGP/TITLE_COMPOSE_OPEN_PGP"></span>
+				<span data-i18n="POPUPS_COMPOSE_OPEN_PGP/TITLE_COMPOSE_OPEN_PGP"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -83,7 +83,7 @@
 			<div class="row-fluid key-actions">
 				<div class="span6">
 					<div data-bind="visible: sign()">
-						<input type="password" class="inputPassword input-block-level i18n"
+						<input type="password" class="inputPassword input-block-level"
 							autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
 							data-i18n="[placeholder]GLOBAL/PASSWORD"
 							data-bind="textInput: password, onEnter: doCommand" />
@@ -107,9 +107,9 @@
 			<button class="btn buttonDo" data-bind="command: doCommand,
 				enable: (sign() || encrypt()) && (!encrypt() || encrypt() && encryptKeys().length > 0)">
 				<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
-				<span class="i18n" data-bind="visible: sign() && !encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN"></span>
-				<span class="i18n" data-bind="visible: !sign() && encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_ENCRYPT"></span>
-				<span class="i18n" data-bind="visible: (sign() && encrypt()) || (!sign() && !encrypt())" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN_AND_ENCRYPT"></span>
+				<span data-bind="visible: sign() && !encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN"></span>
+				<span data-bind="visible: !sign() && encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_ENCRYPT"></span>
+				<span data-bind="visible: (sign() && encrypt()) || (!sign() && !encrypt())" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN_AND_ENCRYPT"></span>
 			</button>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index 7aa43882f..a1e289dfa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -8,7 +8,7 @@
 			<div class="btn-group">
 				<a class="btn button-create-contact" data-bind="command: newCommand">
 					<i class="icon-plus"></i>
-					<span class="i18n" data-i18n="CONTACTS/BUTTON_ADD_CONTACT"></span>
+					<span data-i18n="CONTACTS/BUTTON_ADD_CONTACT"></span>
 				</a>
 			</div>
 
@@ -33,25 +33,25 @@
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="initDom: importUploaderButton">
 							<i data-bind="css: {'icon-import': !contacts.importing(), 'icon-spinner': contacts.importing}"></i>
-							<span class="i18n" data-i18n="CONTACTS/BUTTON_IMPORT"></span>
+							<span data-i18n="CONTACTS/BUTTON_IMPORT"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar hide-mobile" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: exportCsv">
 							<i data-bind="css: {'icon-export': !contacts.exportingCsv(), 'icon-spinner': contacts.exportingCsv}"></i>
-							<span class="i18n" data-i18n="CONTACTS/BUTTON_EXPORT_CSV"></span>
+							<span data-i18n="CONTACTS/BUTTON_EXPORT_CSV"></span>
 						</a>
 					</li>
 					<li class="e-item hide-mobile" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: exportVcf">
 							<i data-bind="css: {'icon-export': !contacts.exportingVcf(), 'icon-spinner': contacts.exportingVcf}"></i>
-							<span class="i18n" data-i18n="CONTACTS/BUTTON_EXPORT_VCARD"></span>
+							<span data-i18n="CONTACTS/BUTTON_EXPORT_VCARD"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: enableContactsSync() && allowContactsSync()">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="command: syncCommand">
 							<i data-bind="css: {'icon-sync': !contacts.syncing(), 'icon-spinner': contacts.syncing}"></i>
-							<span class="i18n" data-i18n="CONTACTS/BUTTON_SYNC"></span>
+							<span data-i18n="CONTACTS/BUTTON_SYNC"></span>
 						</a>
 					</li>
 				</ul>
@@ -67,16 +67,16 @@
 			<div class="content">
 				<div class="content-wrapper">
 					<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
-						<span class="g-ui-link i18n" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
+						<span class="g-ui-link" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="command: clearCommand"></span>
 					</div>
 					<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()">
-						<span class="i18n" data-i18n="CONTACTS/EMPTY_LIST"></span>
+						<span data-i18n="CONTACTS/EMPTY_LIST"></span>
 					</div>
 					<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
-						<span class="i18n" data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
+						<span data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
 					</div>
 					<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()">
-						<span class="i18n" data-i18n="CONTACTS/EMPTY_SEARCH"></span>
+						<span data-i18n="CONTACTS/EMPTY_SEARCH"></span>
 					</div>
 					<div class="e-contact-foreach g-ui-user-select-none" data-bind="foreach: contacts, visible: 0 < contacts().length">
 						<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCss()">
@@ -98,7 +98,7 @@
 			</div>
 		</div>
 		<div class="b-list-footer-toolbar">
-			<div class="pull-right footer-pager">
+			<div class="footer-pager">
 				<!-- ko template: { name: 'Paginator', data: contactsPaginator } --><!-- /ko -->
 			</div>
 		</div>
@@ -106,44 +106,44 @@
 			<div class="btn-group">
 				<button class="btn button-save-contact" data-bind="visible: !emptySelection(), command: saveCommand, css: {'dirty': watchDirty}">
 					<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner': viewSaving()}"></i>
-					<span class="i18n" data-i18n="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
-					<span class="i18n" data-i18n="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
+					<span data-i18n="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
+					<span data-i18n="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
 				</button>
 			</div>
 			<div class="btn-group dropdown colored-toggle button-add-prop" data-bind="visible: !emptySelection(), registerBootstrapDropdown: true">
 				<a id="button-add-prop-dropdown-id" href="#" tabindex="-1" class="btn dropdown-toggle" data-toggle="dropdown">
-					<span class="i18n" data-i18n="CONTACTS/ADD_MENU_LABEL"></span>
+					<span data-i18n="CONTACTS/ADD_MENU_LABEL"></span>
 					&nbsp;&nbsp;
 					<span class="caret"></span>
 				</a>
-				<ul class="dropdown-menu g-ui-menu" style="text-align: left" tabindex="-1" role="menu" aria-labelledby="button-add-prop-dropdown-id">
+				<ul class="dropdown-menu g-ui-menu right-edge" style="text-align: left" tabindex="-1" role="menu" aria-labelledby="button-add-prop-dropdown-id">
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewEmail">
 							<i class="icon-none"></i>
-							<span class="i18n" data-i18n="GLOBAL/EMAIL"></span>
+							<span data-i18n="GLOBAL/EMAIL"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewPhone">
 							<i class="icon-none"></i>
-							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_PHONE"></span>
+							<span data-i18n="CONTACTS/ADD_MENU_PHONE"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewWeb">
 							<i class="icon-none"></i>
-							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_URL"></span>
+							<span data-i18n="CONTACTS/ADD_MENU_URL"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewNickname">
 							<i class="icon-none"></i>
-							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_NICKNAME"></span>
+							<span data-i18n="CONTACTS/ADD_MENU_NICKNAME"></span>
 						</a>
 					</li>
 <!--									<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addNewAddress">
-							<span class="i18n" data-i18n="CONTACTS/ADD_MENU_ADDRESS"></span>
+							<span data-i18n="CONTACTS/ADD_MENU_ADDRESS"></span>
 						</a>
 					</li>-->
 				</ul>
@@ -153,7 +153,7 @@
 			<div class="content">
 				<div class="content-wrapper">
 					<div class="b-contact-view-desc" data-bind="visible: emptySelection">
-						<span class="i18n" data-i18n="CONTACTS/CONTACT_VIEW_DESC"></span>
+						<span data-i18n="CONTACTS/CONTACT_VIEW_DESC"></span>
 					</div>
 					<div data-bind="visible: !emptySelection()">
 						<div class="form-horizontal top-part">
@@ -201,7 +201,7 @@
 												data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'" />
 										</div>
 									</div>
-									<a href="javascript:void(0);" class="g-ui-link add-link i18n" data-bind="visible: !viewReadOnly(), click: addNewEmail" data-i18n="CONTACTS/LINK_ADD_EMAIL"></a>
+									<a href="javascript:void(0);" class="g-ui-link add-link" data-bind="visible: !viewReadOnly(), click: addNewEmail" data-i18n="CONTACTS/LINK_ADD_EMAIL"></a>
 								</div>
 							</div>
 							<div class="control-group" data-bind="visible: 0 < viewPropertiesPhones().length">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index 9a8012801..bc79dfbea 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -3,8 +3,8 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_FILTER/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
-				<span class="i18n" data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
+				<span data-i18n="POPUPS_FILTER/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
+				<span data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -21,13 +21,13 @@
 						</div>
 					</div>
 
-					<div class="legend i18n" data-i18n="POPUPS_FILTER/LEGEND_CONDITIONS"></div>
+					<div class="legend" data-i18n="POPUPS_FILTER/LEGEND_CONDITIONS"></div>
 					<div>
 						<div data-bind="visible: 1 < conditions().length">
 							<select class="span4" data-bind="value: conditionsType">
-								<option value="Any" class="i18n"
+								<option value="Any"
 									data-i18n="POPUPS_FILTER/SELECT_MATCH_ANY"></option>
-								<option value="All" class="i18n"
+								<option value="All"
 									data-i18n="POPUPS_FILTER/SELECT_MATCH_ALL"></option>
 							</select>
 						</div>
@@ -35,16 +35,16 @@
 							<div data-bind="template: {'name': template(), 'data': $data}"></div>
 						</div>
 						<div data-bind="visible: 0 === conditions().length">
-							<span class="i18n" data-i18n="POPUPS_FILTER/ALL_INCOMING_MESSAGES_DESC"></span>
+							<span data-i18n="POPUPS_FILTER/ALL_INCOMING_MESSAGES_DESC"></span>
 						</div>
 						<br />
 						<a class="btn" data-bind="click: addCondition, i18nInit: true">
 							<i class="icon-plus"></i>
-							<span class="i18n" data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
+							<span data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
 						</a>
 					</div>
 					<br />
-					<div class="legend i18n" data-i18n="POPUPS_FILTER/LEGEND_ACTIONS"></div>
+					<div class="legend" data-i18n="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>
@@ -53,7 +53,7 @@
 		<div class="modal-footer">
 			<a class="btn buttonSave" data-bind="command: saveFilterCommand">
 				<i class="icon-ok"></i>
-				<span class="i18n" data-i18n="GLOBAL/DONE"></span>
+				<span data-i18n="GLOBAL/DONE"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
index 4e3135eb7..30f27967a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
@@ -3,8 +3,8 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="visible: !clearingProcess()"></span>
-				<span class="i18n" data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearingProcess"></span>
+				<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="visible: !clearingProcess()"></span>
+				<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearingProcess"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -12,19 +12,19 @@
 				<i class="fontastic" style="color:red">⚠</i>
 				&nbsp;&nbsp;
 				<strong>
-					<span class="i18n" data-i18n="[html]POPUPS_CLEAR_FOLDER/DANGER_DESC_WARNING"></span>
+					<span data-i18n="[html]POPUPS_CLEAR_FOLDER/DANGER_DESC_WARNING"></span>
 				</strong>
 				<br />
 				<br />
 				<span data-bind="html: dangerDescHtml"></span>
 				<br />
-				<span class="i18n" data-i18n="[html]POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_2"></span>
+				<span data-i18n="[html]POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_2"></span>
 			</div>
 		</div>
 		<div class="modal-footer">
 			<a class="btn btn-danger buttonClear" data-bind="command: clearCommand">
 				<i class="fontastic" data-bind="css: {'icon-spinner white': clearingProcess()}">🔥</i>
-				<span class="i18n" data-i18n="GLOBAL/CLEAR"></span>
+				<span data-i18n="GLOBAL/CLEAR"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
index 4f9bc30aa..f74b6111e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderCreate.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></span>
+				<span data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -11,7 +11,7 @@
 				<br />
 				<div class="control-group">
 					<label class="control-label">
-						<span class="i18n" data-i18n="GLOBAL/NAME"></span>
+						<span data-i18n="GLOBAL/NAME"></span>
 					</label>
 					<div class="controls">
 						<input type="text" class="uiInput inputName" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -20,7 +20,7 @@
 				</div>
 				<div class="control-group">
 					<label class="control-label">
-						<span class="i18n" data-i18n="POPUPS_CREATE_FOLDER/LABEL_PARENT"></span>
+						<span data-i18n="POPUPS_CREATE_FOLDER/LABEL_PARENT"></span>
 					</label>
 					<div class="controls">
 						<select data-bind="options: parentFolderSelectList, value: selectedParentValue,
@@ -32,7 +32,7 @@
 		<div class="modal-footer">
 			<a class="btn buttonCreate" data-bind="command: createFolderCommand">
 				<i class="icon-folder-add"></i>
-				<span class="i18n" data-i18n="POPUPS_CREATE_FOLDER/BUTTON_CREATE"></span>
+				<span data-i18n="POPUPS_CREATE_FOLDER/BUTTON_CREATE"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
index ff3c0de6a..66339a852 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderSystem.html
@@ -2,7 +2,7 @@
 	<div class="modal-header">
 		<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 		<h3>
-			<span class="i18n" data-i18n="POPUPS_SYSTEM_FOLDERS/TITLE_SYSTEM_FOLDERS"></span>
+			<span data-i18n="POPUPS_SYSTEM_FOLDERS/TITLE_SYSTEM_FOLDERS"></span>
 		</h3>
 	</div>
 	<div class="modal-body">
@@ -13,7 +13,7 @@
 			<br />
 			<div class="control-group">
 				<label class="control-label">
-					<span class="i18n" data-i18n="FOLDER_LIST/SENT_NAME"></span>
+					<span data-i18n="FOLDER_LIST/SENT_NAME"></span>
 				</label>
 				<div class="controls">
 					<select data-bind="options: folderSelectList, value: sentFolder,
@@ -22,7 +22,7 @@
 			</div>
 			<div class="control-group">
 				<label class="control-label">
-					<span class="i18n" data-i18n="FOLDER_LIST/DRAFTS_NAME"></span>
+					<span data-i18n="FOLDER_LIST/DRAFTS_NAME"></span>
 				</label>
 				<div class="controls">
 					<select data-bind="options: folderSelectList, value: draftFolder,
@@ -31,7 +31,7 @@
 			</div>
 			<div class="control-group">
 				<label class="control-label">
-					<span class="i18n" data-i18n="GLOBAL/SPAM"></span>
+					<span data-i18n="GLOBAL/SPAM"></span>
 				</label>
 				<div class="controls">
 					<select data-bind="options: folderSelectList, value: spamFolder,
@@ -40,7 +40,7 @@
 			</div>
 			<div class="control-group">
 				<label class="control-label">
-					<span class="i18n" data-i18n="FOLDER_LIST/TRASH_NAME"></span>
+					<span data-i18n="FOLDER_LIST/TRASH_NAME"></span>
 				</label>
 				<div class="controls">
 					<select data-bind="options: folderSelectList, value: trashFolder,
@@ -49,7 +49,7 @@
 			</div>
 			<div class="control-group">
 				<label class="control-label">
-					<span class="i18n" data-i18n="FOLDER_LIST/ARCHIVE_NAME"></span>
+					<span data-i18n="FOLDER_LIST/ARCHIVE_NAME"></span>
 				</label>
 				<div class="controls">
 					<select data-bind="options: folderSelectList, value: archiveFolder,
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
index 3b9635be4..f2ee140e6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
@@ -3,8 +3,8 @@
 		<div class="modal-header g-ui-user-select-none">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span data-bind="visible: !edit()" class="i18n" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
-				<span data-bind="visible: edit" class="i18n" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
+				<span data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
+				<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -87,9 +87,9 @@
 		<div class="modal-footer">
 			<a class="btn buttonAddIdentity" data-bind="command: addOrEditIdentityCommand">
 				<i data-bind="visible: !edit(), css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<span data-bind="visible: !edit()" class="i18n" data-i18n="POPUPS_IDENTITY/BUTTON_ADD_IDENTITY"></span>
+				<span data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/BUTTON_ADD_IDENTITY"></span>
 				<i data-bind="visible: edit, css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<span data-bind="visible: edit" class="i18n" data-i18n="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span>
+				<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
index 276f5a954..d458be0ef 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_MESSAGE_OPEN_PGP/TITLE_MESSAGE_OPEN_PGP"></span>
+				<span data-i18n="POPUPS_MESSAGE_OPEN_PGP/TITLE_MESSAGE_OPEN_PGP"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -43,7 +43,7 @@
 		<div class="modal-footer">
 			<button class="btn buttonDo" data-bind="command: doCommand">
 				<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
-				<span class="i18n" data-i18n="POPUPS_MESSAGE_OPEN_PGP/BUTTON_DECRYPT"></span>
+				<span data-i18n="POPUPS_MESSAGE_OPEN_PGP/BUTTON_DECRYPT"></span>
 			</button>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
index 412700a3f..eb44691b7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/TITLE_GENERATE_OPEN_PGP_KEYS"></span>
+				<span data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/TITLE_GENERATE_OPEN_PGP_KEYS"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -48,7 +48,7 @@
 		<div class="modal-footer">
 			<a class="btn buttonHenerateOpenPgpKey" data-bind="command: generateOpenPgpKeyCommand">
 				<i class="fontastic" data-bind="css: {'icon-spinner': submitRequest()}">🔑</i>
-				<span class="i18n" data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
+				<span data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index 9b68ab42c..201c68dee 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -3,8 +3,8 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: $root.cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_CREATE" data-bind="visible: !exists()"></span>
-				<span class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_EDIT" data-bind="visible: exists"></span>
+				<span data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_CREATE" data-bind="visible: !exists()"></span>
+				<span data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_EDIT" data-bind="visible: exists"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -24,7 +24,7 @@
 				<div class="span8 width100-on-mobile">
 					<div class="alert g-ui-user-select-none">
 						<i class="fontastic">⚠</i>
-						<span class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/CHANGES_NEED_TO_BE_SAVED_DESC"></span>
+						<span data-i18n="POPUPS_SIEVE_SCRIPT/CHANGES_NEED_TO_BE_SAVED_DESC"></span>
 					</div>
 				</div>
 			</div>
@@ -40,7 +40,7 @@
 			<div class="control-group" data-bind="visible: $root.rawActive">
 				<div class="controls">
 					<pre>
-						<b class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/CAPABILITY_LABEL"></b>:
+						<b data-i18n="POPUPS_SIEVE_SCRIPT/CAPABILITY_LABEL"></b>:
 						<span data-bind="text: $root.sieveCapabilities"></span>
 					</pre>
 					<textarea class="span8" data-bind="value: body, valueUpdate: 'input'"></textarea>
@@ -73,7 +73,7 @@
 							</td>
 							<td>
 								<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oFilter) { $root.deleteFilter(oFilter); }">
-									<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+									<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 								</a>
 							</td>
 							<td>
@@ -86,7 +86,7 @@
 				</table>
 				<a class="btn" data-bind="click: $root.addFilter">
 					<i class="icon-plus"></i>
-					<span class="i18n" data-i18n="POPUPS_SIEVE_SCRIPT/BUTTON_ADD_FILTER"></span>
+					<span data-i18n="POPUPS_SIEVE_SCRIPT/BUTTON_ADD_FILTER"></span>
 				</a>
 			</div>
 		</div>
@@ -97,7 +97,7 @@
 			</a>
 			<a class="btn buttonSave" data-bind="visible: hasChanges, click: function() { $root.saveScriptCommand(); }, css: {'btn-danger': $root.saveError}">
 				<i class="fontastic" data-bind="css: {'icon-spinner': $root.saving}">💾</i>
-				<span class="i18n" data-i18n="GLOBAL/SAVE"></span>
+				<span data-i18n="GLOBAL/SAVE"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html
index 37e83bdb5..67478ab18 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTemplate.html
@@ -3,8 +3,8 @@
 		<div class="modal-header g-ui-user-select-none">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span data-bind="visible: '' === id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/TITLE_ADD_TEMPLATE"></span>
-				<span data-bind="visible: '' !== id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/TITLE_UPDATE_TEMPLATE"></span>
+				<span data-bind="visible: '' === id()" data-i18n="POPUPS_ADD_TEMPLATE/TITLE_ADD_TEMPLATE"></span>
+				<span data-bind="visible: '' !== id()" data-i18n="POPUPS_ADD_TEMPLATE/TITLE_UPDATE_TEMPLATE"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -32,9 +32,9 @@
 		<div class="modal-footer">
 			<a class="btn buttonAddAccount" data-bind="command: addTemplateCommand">
 				<i data-bind="visible: '' == id(), css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<span data-bind="visible: '' == id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_ADD_TEMPLATE"></span>
+				<span data-bind="visible: '' == id()" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_ADD_TEMPLATE"></span>
 				<i data-bind="visible: '' !== id(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-				<span data-bind="visible: '' !== id()" class="i18n" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_UPDATE_TEMPLATE"></span>
+				<span data-bind="visible: '' !== id()" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_UPDATE_TEMPLATE"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html
index bc2035c66..6ea68cc7e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorConfiguration.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="visible: viewEnable() || !lock(), command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/LEGEND_TWO_FACTOR_AUTH"></span>
+				<span data-i18n="POPUPS_TWO_FACTOR_CFG/LEGEND_TWO_FACTOR_AUTH"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -28,7 +28,7 @@
 				</div>
 				<div class="control-group">
 					<label class="control-label">
-						<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_USER"></span>
+						<span data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_USER"></span>
 					</label>
 					<div class="controls" style="padding-top: 5px;">
 						<strong><span data-bind="text: viewUser"></span></strong>
@@ -42,18 +42,18 @@
 				<div class="control-group" data-bind="visible: '' === viewSecret() && twoFactorStatus() && !clearing()">
 					<div class="controls" style="padding-top: 5px;">
 						<strong data-bind="visible: secreting">...</strong>
-						<span class="g-ui-link i18n" data-bind="click: showSecret, visible: !secreting()"
+						<span class="g-ui-link" data-bind="click: showSecret, visible: !secreting()"
 							data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_SHOW_SECRET"></span>
 					</div>
 				</div>
 				<div class="control-group" data-bind="visible: '' !== viewSecret()">
 					<label class="control-label">
-						<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_SECRET"></span>
+						<span data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_SECRET"></span>
 					</label>
 					<div class="controls" style="padding-top: 5px;">
 						<strong data-bind="text: viewSecret"></strong>
 						&nbsp;&nbsp;
-						<span class="g-ui-link i18n" data-bind="click: hideSecret" data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_HIDE_SECRET"></span>
+						<span class="g-ui-link" data-bind="click: hideSecret" data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_HIDE_SECRET"></span>
 						<br />
 						<br />
 						<blockquote>
@@ -66,7 +66,7 @@
 				</div>
 				<div class="control-group" data-bind="visible: '' !== viewBackupCodes()">
 					<label class="control-label">
-						<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_BACKUP_CODES"></span>
+						<span data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_BACKUP_CODES"></span>
 					</label>
 					<div class="controls" style="padding-top: 5px;">
 						<pre data-bind="text: viewBackupCodes" style="width: 230px; word-break: break-word;"></pre>
@@ -81,19 +81,19 @@
 		<div class="modal-footer">
 			<a class="btn pull-left" data-bind="visible: lock, click: logout">
 				<i class="fontastic">⏻</i>
-				<span class="i18n" data-i18n="GLOBAL/LOGOUT"></span>
+				<span data-i18n="GLOBAL/LOGOUT"></span>
 			</a>
 			<a class="btn btn-danger" data-bind="click: clearTwoFactor, visible: twoFactorStatus">
 				<i class="fontastic" data-bind="css: {'icon-spinner': clearing()}">✖</i>
-				<span class="i18n" data-i18n="GLOBAL/CLEAR"></span>
+				<span data-i18n="GLOBAL/CLEAR"></span>
 			</a>
 			<a class="btn" data-bind="click: createTwoFactor, visible: !twoFactorStatus()">
 				<i class="fontastic" data-bind="css: {'icon-spinner': processing()}">▶</i>
-				<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_ACTIVATE"></span>
+				<span data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_ACTIVATE"></span>
 			</a>
 			<a class="btn" data-bind="command: cancelCommand, visible: viewEnable() || !lock()">
 				<i class="icon-ok" ></i>
-				<span class="i18n" data-i18n="GLOBAL/DONE"></span>
+				<span data-i18n="GLOBAL/DONE"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html
index 2bffa635a..adc6e8375 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsTwoFactorTest.html
@@ -3,7 +3,7 @@
 		<div class="modal-header">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_TEST/TITLE_TEST_CODE"></span>
+				<span data-i18n="POPUPS_TWO_FACTOR_TEST/TITLE_TEST_CODE"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -11,7 +11,7 @@
 				<br />
 				<div class="control-group">
 					<label class="control-label">
-						<span class="i18n" data-i18n="POPUPS_TWO_FACTOR_TEST/LABEL_CODE"></span>
+						<span data-i18n="POPUPS_TWO_FACTOR_TEST/LABEL_CODE"></span>
 					</label>
 					<div class="controls">
 						<input type="text" class="uiInput inputName"
@@ -24,7 +24,7 @@
 		<div class="modal-footer">
 			<a class="btn" data-bind="command: testCodeCommand, css: { 'btn-success': true === codeStatus(), 'btn-danger': false === codeStatus() }">
 				<i data-bind="css: {'icon-ok': !testing(), 'icon-spinner': testing(), 'icon-white': true === codeStatus() || false === codeStatus() }"></i>
-				<span class="i18n" data-i18n="GLOBAL/TEST"></span>
+				<span data-i18n="GLOBAL/TEST"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html
index 2cd7c5c2d..d149e4d5b 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsViewOpenPgpKey.html
@@ -3,7 +3,7 @@
 		<div class="modal-header g-ui-user-select-none">
 			<button type="button" class="close" data-bind="command: cancelCommand">×</button>
 			<h3>
-				<span class="i18n" data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/TITLE_VIEW_OPEN_PGP_KEY"></span>
+				<span data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/TITLE_VIEW_OPEN_PGP_KEY"></span>
 			</h3>
 		</div>
 		<div class="modal-body">
@@ -16,11 +16,11 @@
 		<div class="modal-footer">
 			<a class="btn buttonClose" data-bind="command: cancelCommand">
 				<i class="fontastic">✖</i>
-				<span class="i18n" data-i18n="GLOBAL/CLOSE"></span>
+				<span data-i18n="GLOBAL/CLOSE"></span>
 			</a>
 			<a class="btn buttonClose" data-bind="click: selectKey">
 				<i class="fontastic">🔑</i>
-				<span class="i18n" data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/BUTTON_SELECT"></span>
+				<span data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/BUTTON_SELECT"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html
index fd2224435..6ee668746 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsWindowSimpleMessage.html
@@ -81,35 +81,35 @@ pre {
 <table cellpadding="0" cellspacing="0" class="tbl">
 	<tbody>
 		<tr>
-			<td class="tt i18n" data-i18n="GLOBAL/FROM"></td>
+			<td class="tt" data-i18n="GLOBAL/FROM"></td>
 			<td class="tv" data-bind="text: popupFrom"></td>
 		</tr>
 		<tr>
-			<td class="tt i18n" data-i18n="GLOBAL/TO"></td>
+			<td class="tt" data-i18n="GLOBAL/TO"></td>
 			<td class="tv" data-bind="text: popupTo"></td>
 		</tr>
 		<tr data-bind="visible: '' !== popupCc">
-			<td class="tt i18n" data-i18n="GLOBAL/CC"></td>
+			<td class="tt" data-i18n="GLOBAL/CC"></td>
 			<td class="tv" data-bind="text: popupCc"></td>
 		</tr>
 		<tr data-bind="visible: '' !== popupBcc">
-			<td class="tt i18n" data-i18n="GLOBAL/BCC"></td>
+			<td class="tt" data-i18n="GLOBAL/BCC"></td>
 			<td class="tv" data-bind="text: popupBcc"></td>
 		</tr>
 		<tr data-bind="visible: '' !== popupReplyTo">
-			<td class="tt i18n" data-i18n="GLOBAL/REPLY_TO"></td>
+			<td class="tt" data-i18n="GLOBAL/REPLY_TO"></td>
 			<td class="tv" data-bind="text: popupReplyTo"></td>
 		</tr>
 		<tr data-bind="visible: '' !== popupDate">
-			<td class="tt i18n" data-i18n="MESSAGE/LABEL_DATE"></td>
+			<td class="tt" data-i18n="MESSAGE/LABEL_DATE"></td>
 			<td class="tv" data-bind="text: popupDate"></td>
 		</tr>
 		<tr>
-			<td class="tt i18n" data-i18n="GLOBAL/SUBJECT"></td>
+			<td class="tt" data-i18n="GLOBAL/SUBJECT"></td>
 			<td class="tv" data-bind="text: popupSubject"></td>
 		</tr>
 		<tr data-bind="visible: '' !== popupAttachments">
-			<td class="tt i18n" data-i18n="MESSAGE/PRINT_LABEL_ATTACHMENTS"></td>
+			<td class="tt" data-i18n="MESSAGE/PRINT_LABEL_ATTACHMENTS"></td>
 			<td class="tv" data-bind="text: popupAttachments"></td>
 		</tr>
 		<tr>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index a1069ca13..41841efbd 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -2,14 +2,14 @@
 	<div data-bind="visible: allowAdditionalAccount">
 		<div class="form-horizontal">
 			<div class="legend">
-				<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
+				<span data-i18n="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
 				&nbsp;&nbsp;&nbsp;
 				<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: accounts.loading"></i>
 			</div>
 		</div>
 		<a class="btn" data-bind="click: addNewAccount">
 			<i class="icon-user-add"></i>
-			<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
+			<span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
 		</a>
 		<br />
 		<br />
@@ -31,7 +31,7 @@
 						</td>
 						<td>
 							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oAccount) { $root.deleteAccount(oAccount); }">
-								<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+								<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 							</a>
 						</td>
 						<td>
@@ -48,12 +48,12 @@
 		<br />
 		<div class="form-horizontal">
 			<div class="legend">
-				<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/LEGEND_IDENTITIES"></span>
+				<span data-i18n="SETTINGS_ACCOUNTS/LEGEND_IDENTITIES"></span>
 			</div>
 		</div>
 		<a class="btn" data-bind="click: addNewIdentity">
 			<i class="icon-user-add"></i>
-			<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span>
+			<span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span>
 		</a>
 		<br />
 		<br />
@@ -74,12 +74,12 @@
 							<span class="identity-name" data-bind="text: formattedName()"></span>
 							&nbsp;&nbsp;
 							<span class="identity-default" data-bind="visible: 0 === $index()">
-								(<span class="i18n" data-i18n="SETTINGS_ACCOUNTS/DEFAULT_IDENTITY_LABEL"></span>)
+								(<span data-i18n="SETTINGS_ACCOUNTS/DEFAULT_IDENTITY_LABEL"></span>)
 							</span>
 						</td>
 						<td>
 							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="visible: canBeDeleted, css: {'delete-access': deleteAccess}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }">
-								<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+								<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 							</a>
 						</td>
 						<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
index 5e9b922fd..5e6955516 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsChangePassword.html
@@ -1,13 +1,13 @@
 <div class="b-settings-general g-ui-user-select-none">
 	<div class="form-horizontal long-label">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LEGEND_CHANGE_PASSWORD"></span>
+			<span data-i18n="SETTINGS_CHANGE_PASSWORD/LEGEND_CHANGE_PASSWORD"></span>
 		</div>
 		<div class="row">
 			<div class="span6">
 				<div class="control-group" data-bind="css: {'error': currentPassword.error}">
 					<label class="control-label">
-						<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_CURRENT_PASSWORD"></span>
+						<span data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_CURRENT_PASSWORD"></span>
 					</label>
 					<div class="controls">
 						<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -16,7 +16,7 @@
 				</div>
 				<div class="control-group" data-bind="css: {'error': passwordMismatch}">
 					<label class="control-label">
-						<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_NEW_PASSWORD"></span>
+						<span data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_NEW_PASSWORD"></span>
 					</label>
 					<div class="controls">
 						<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -25,7 +25,7 @@
 				</div>
 				<div class="control-group" data-bind="css: {'error': passwordMismatch}">
 					<label class="control-label">
-						<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_REPEAT_PASSWORD"></span>
+						<span data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_REPEAT_PASSWORD"></span>
 					</label>
 					<div class="controls">
 						<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -36,7 +36,7 @@
 					<div class="controls">
 						<a class="btn" data-bind="command: saveNewPasswordCommand, css: { 'btn-success': passwordUpdateSuccess, 'btn-danger': passwordUpdateError }">
 							<i class="fontastic" data-bind="css: {'icon-spinner': changeProcess(), 'icon-white': passwordUpdateSuccess() || passwordUpdateError() }">🔑</i>
-							<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/BUTTON_UPDATE_PASSWORD"></span>
+							<span data-i18n="SETTINGS_CHANGE_PASSWORD/BUTTON_UPDATE_PASSWORD"></span>
 						</a>
 					</div>
 				</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
index b6318cf17..687ea6945 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
@@ -1,7 +1,7 @@
 <div class="b-settings-contacts">
 	<div class="form-horizontal g-ui-user-select-none">
 		<div class="legend">
-			<span class="i18n" data-i18n="GLOBAL/CONTACTS"></span>
+			<span data-i18n="GLOBAL/CONTACTS"></span>
 		</div>
 		<div class="control-group">
 			<div class="controls">
@@ -18,7 +18,7 @@
 	<br />
 	<div class="form-horizontal" data-bind="visible: allowContactsSync">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_CONTACTS/LEGEND_CONTACTS_SYNC"></span>
+			<span data-i18n="SETTINGS_CONTACTS/LEGEND_CONTACTS_SYNC"></span>
 		</div>
 		<div class="control-group">
 			<div class="controls">
@@ -33,7 +33,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_AB_URL"></span>
+				<span data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_AB_URL"></span>
 			</label>
 			<div class="controls">
 				<input type="text" class="input-xxlarge" autocomplete="off" autocorrect="off" autocapitalize="off"
@@ -42,7 +42,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_USER"></span>
+				<span data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_USER"></span>
 			</label>
 			<div class="controls">
 				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
@@ -51,7 +51,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="GLOBAL/PASSWORD"></span>
+				<span data-i18n="GLOBAL/PASSWORD"></span>
 			</label>
 			<div class="controls">
 				<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index f970dd029..61cc3952a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -1,7 +1,7 @@
 <div class="b-settings-filters g-ui-user-select-none">
 	<div class="form-horizontal">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_FILTERS/LEGEND_FILTERS"></span>
+			<span data-i18n="SETTINGS_FILTERS/LEGEND_FILTERS"></span>
 			&nbsp;&nbsp;&nbsp;
 			<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 		</div>
@@ -34,7 +34,7 @@
 						<td class="e-action" class="script-name" data-bind="text: name()"></td>
 						<td>
 							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oScript) { $root.deleteScript(oScript); }">
-								<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+								<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 							</a>
 						</td>
 						<td>
@@ -47,7 +47,7 @@
 			</table>
 			<a class="btn" data-bind="click: $root.addScript">
 				<i class="icon-plus"></i>
-				<span class="i18n" data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></span>
+				<span data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></span>
 			</a>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
index dd587bcc8..36fc2a5f3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
@@ -1,6 +1,6 @@
 <div class="control-group" data-bind="css: {'error': actionValueError}">
 	<div class="controls">
-		<input type="text" class="span3 i18n" data-bind="value: actionValue"
+		<input type="text" class="span3" data-bind="value: actionValue"
 			data-i18n="[placeholder]GLOBAL/EMAIL" />
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
index 5c103b34f..209cf6661 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
@@ -1,6 +1,6 @@
 <div class="control-group" data-bind="css: {'error': actionValueError}" style="margin-bottom: 0">
 	<div class="controls">
-		<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
+		<textarea class="span5" data-bind="value: actionValue" style="height: 100px;"
 			data-i18n="[placeholder]POPUPS_FILTER/REJECT_MESSAGE_LABEL"></textarea>
 		<div data-bind="component: {
 			name: 'Checkbox',
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
index c90c0bf09..676d9cf75 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
@@ -13,7 +13,7 @@
 </div>
 <div class="control-group" data-bind="css: {'error': actionValueFourthError}" style="margin-bottom: 0">
 	<div class="controls">
-		<input type="text" class="span5 i18n" data-bind="value: actionValueFourth"
+		<input type="text" class="span5" data-bind="value: actionValueFourth"
 			data-i18n="[placeholder]POPUPS_FILTER/VACATION_RECIPIENTS_LABEL" />
 		<button class="btn setRecipientsBtn" data-bind="click: setRecipients">
 			<i class="icon-plus"></i>
@@ -22,13 +22,13 @@
 </div>
 <div class="control-group" style="margin-bottom: 0">
 	<div class="controls">
-		<input type="text" class="span5 i18n" data-bind="value: actionValueSecond"
+		<input type="text" class="span5" data-bind="value: actionValueSecond"
 			data-i18n="[placeholder]POPUPS_FILTER/VACATION_SUBJECT_LABEL" />
 	</div>
 </div>
 <div class="control-group" data-bind="css: {'error': actionValueError}" style="margin-bottom: 0">
 	<div class="controls">
-		<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
+		<textarea class="span5" data-bind="value: actionValue" style="height: 100px;"
 			data-i18n="[placeholder]POPUPS_FILTER/VACATION_MESSAGE_LABEL"></textarea>
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
index 82a0d7144..7ac8cbfd9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
@@ -8,7 +8,7 @@
 		&nbsp;
 		<span class="folder-system-name" data-bind="text: manageFolderSystemName, visible: isSystemFolder"></span>
 		<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function() { $root.deleteFolder($data); }">
-			<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+			<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 		</a>
 	</td>
 	<td data-bind="tooltip: 'SETTINGS_FOLDERS/HELP_DELETE_FOLDER'">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
index 8bbda90a0..3251c6634 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
@@ -1,24 +1,24 @@
 <div class="b-settings-folders">
 	<div class="form-horizontal">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_FOLDERS/LEGEND_FOLDERS"></span>
+			<span data-i18n="SETTINGS_FOLDERS/LEGEND_FOLDERS"></span>
 			&nbsp;&nbsp;&nbsp;
 			<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 		</div>
 	</div>
 	<a class="btn" data-bind="click: createFolder">
 		<i class="icon-folder-add"></i>
-		<span class="i18n" data-i18n="SETTINGS_FOLDERS/BUTTON_CREATE"></span>
+		<span data-i18n="SETTINGS_FOLDERS/BUTTON_CREATE"></span>
 	</a>
 	&nbsp;&nbsp;
 	<a class="btn" data-bind="click: systemFolder">
 		<i class="fontastic">🔧</i>
-		<span class="i18n" data-i18n="SETTINGS_FOLDERS/BUTTON_SYSTEM"></span>
+		<span data-i18n="SETTINGS_FOLDERS/BUTTON_SYSTEM"></span>
 	</a>
 	<div class="alert folders-list-error" data-bind="visible: folderListOptimized">
-		<b class="i18n" data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_1"></b>
+		<b data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_1"></b>
 		<br />
-		<span class="i18n" data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_2"></span>
+		<span data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_2"></span>
 	</div>
 	<div class="alert folders-list-error" data-bind="visible: '' !== folderListError()">
 		<button type="button" class="close" data-bind="click: function () { folderListError(''); }">×</button>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index 5c193f48c..dfac12fb9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -5,7 +5,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_GENERAL/LABEL_IDENTITY"></span>
+				<span data-i18n="SETTINGS_GENERAL/LABEL_IDENTITY"></span>
 			</label>
 			<div class="controls">
 				<div style="display: inline-block; margin-top: 5px">
@@ -16,7 +16,7 @@
 		</div>
 		<div class="control-group" data-bind="visible: allowLanguagesOnSettings">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_GENERAL/LABEL_LANGUAGE"></span>
+				<span data-i18n="SETTINGS_GENERAL/LABEL_LANGUAGE"></span>
 			</label>
 			<div class="controls">
 				<div class="flag-selector">
@@ -27,7 +27,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-			   <span class="i18n" data-i18n="SETTINGS_GENERAL/LABEL_LAYOUT"></span>
+			   <span data-i18n="SETTINGS_GENERAL/LABEL_LAYOUT"></span>
 			</label>
 			<div class="controls">
 				<div data-bind="component: {
@@ -44,7 +44,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-			   <span class="i18n" data-i18n="SETTINGS_GENERAL/LABEL_EDITOR"></span>
+			   <span data-i18n="SETTINGS_GENERAL/LABEL_EDITOR"></span>
 			</label>
 			<div class="controls">
 				<div data-bind="component: {
@@ -61,7 +61,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-			   <span class="i18n" data-i18n="SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE"></span>
+			   <span data-i18n="SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE"></span>
 			</label>
 			<div class="controls">
 				<div data-bind="component: {
@@ -127,7 +127,7 @@
 						}
 					}"></div>
 					&nbsp;
-					<span data-bind="visible: isDesktopNotificationDenied" class="i18n" style="color: #999" data-i18n="SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC_DENIED"></span>
+					<span data-bind="visible: isDesktopNotificationDenied" style="color: #999" data-i18n="SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC_DENIED"></span>
 					<span data-bind="click: testSystemNotification" style="color:green;cursor:pointer">
 						<i class="icon-right-dir iconsize20"></i>
 					</span>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
index 2b72695ed..1c77b43d6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -4,13 +4,13 @@
 	</div>
 	<button class="btn" data-bind="click: addOpenPgpKey">
 		<i class="icon-list-add"></i>
-		<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span>
+		<span data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span>
 	</button>
 	&nbsp;&nbsp;
 	<div style="display: inline-block" data-bind="tooltip: 'SETTINGS_OPEN_PGP/GENERATE_ONLY_HTTPS'">
 		<button class="btn" data-bind="click: generateOpenPgpKey">
 			<i class="fontastic">🔑</i>
-			<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
+			<span data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
 		</button>
 	</div>
 	<br />
@@ -37,7 +37,7 @@
 			<!-- ko foreach: openpgpkeysPrivate -->
 			<tr class="open-pgp-key-item">
 				<td>
-					<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">
+					<span class="open-pgp-key-img" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">
 						<i class="fontastic">🔒</i>
 					</span>
 					<span class="open-pgp-key-user">
@@ -46,7 +46,7 @@
 					<!-- /ko -->
 					</span>
 					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
-						<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+						<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 					</a>
 				</td>
 				<td>
@@ -64,7 +64,7 @@
 			<!-- ko foreach: openpgpkeysPublic -->
 			<tr class="open-pgp-key-item">
 				<td>
-					<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">
+					<span class="open-pgp-key-img" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">
 						<i class="fontastic">🔑</i>
 					</span>
 					<span class="open-pgp-key-user">
@@ -75,7 +75,7 @@
 					<!-- /ko -->
 					</span>
 					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
-						<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+						<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 					</a>
 				</td>
 				<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index d4e4707ad..79764c757 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -1,11 +1,11 @@
 <div class="b-settings-security">
 	<div class="form-horizontal" data-bind="visible: capaAutoLogout">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_SECURITY/LEGEND_SECURITY"></span>
+			<span data-i18n="SETTINGS_SECURITY/LEGEND_SECURITY"></span>
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-			   <span class="i18n" data-i18n="SETTINGS_SECURITY/LABEL_AUTOLOGOUT"></span>
+			   <span data-i18n="SETTINGS_SECURITY/LABEL_AUTOLOGOUT"></span>
 			</label>
 			<div class="controls">
 				<div data-bind="component: {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
index a8de49951..f18dce24c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html
@@ -1,14 +1,14 @@
 <div class="b-settings-templates g-ui-user-select-none">
 	<div class="form-horizontal">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_TEMPLATES/LEGEND_TEMPLATES"></span>
+			<span data-i18n="SETTINGS_TEMPLATES/LEGEND_TEMPLATES"></span>
 			&nbsp;&nbsp;&nbsp;
 			<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: templates.loading"></i>
 		</div>
 	</div>
 	<a class="btn" data-bind="click: addNewTemplate">
 		<i class="icon-user-add"></i>
-		<span class="i18n" data-i18n="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span>
+		<span data-i18n="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span>
 	</a>
 	<br />
 	<br />
@@ -30,7 +30,7 @@
 						</td>
 						<td>
 							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess}, click: function(oTemplate) { $root.deleteTemplate(oTemplate); }">
-								<span class="i18n" data-i18n="GLOBAL/ARE_YOU_SURE"></span>
+								<span data-i18n="GLOBAL/ARE_YOU_SURE"></span>
 							</a>
 						</td>
 						<td>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
index 6459787f4..5860d13d7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsThemes.html
@@ -1,7 +1,7 @@
 <div class="b-settings-themes g-ui-user-select-none">
 	<div class="form-horizontal">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_THEMES/LEGEND_THEMES"></span>
+			<span data-i18n="SETTINGS_THEMES/LEGEND_THEMES"></span>
 			<span data-bind="saveTrigger: themeTrigger"></span>
 		</div>
 	</div>
@@ -15,7 +15,7 @@
 	<br />
 	<div class="form-horizontal" data-bind="visible: capaUserBackground">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_THEMES/LEGEND_THEMES_CUSTOM"></span>
+			<span data-i18n="SETTINGS_THEMES/LEGEND_THEMES_CUSTOM"></span>
 		</div>
 		<div class="control-group g-ui-user-select-none">
 			<div class="row" data-bind="visible: '' !== background.error()" style="margin-left: 0; margin-bottom: 10px;">
@@ -31,7 +31,7 @@
 			<div class="row" data-bind="visible: '' === background.name()" style="margin-left: 0">
 				<a class="btn" data-bind="initDom: background.uploaderButton">
 					<i class="fontastic" data-bind="css: {'icon-spinner': background.loading()}">🖼</i>
-					<span class="i18n" data-i18n="SETTINGS_THEMES/BUTTON_UPLOAD_BACKGROUND_IMAGE"></span>
+					<span data-i18n="SETTINGS_THEMES/BUTTON_UPLOAD_BACKGROUND_IMAGE"></span>
 				</a>
 			</div>
 		</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
index e848ed15d..4b3550384 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html
@@ -43,43 +43,43 @@
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: capaAdditionalAccounts">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: addAccountClick">
 							<i class="icon-plus"></i>
-							<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"></span>
+							<span data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation" data-bind="visible: allowSettings">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="visible: allowContacts, click: contactsClick">
 							<i class="icon-address-book"></i>
-							<span class="i18n" data-i18n="GLOBAL/CONTACTS"></span>
+							<span data-i18n="GLOBAL/CONTACTS"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation" data-bind="visible: allowSettings">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: settingsClick">
 							<i class="fontastic">⚙</i>
-							<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"></span>
+							<span data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation" data-bind="visible: allowHelp">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: settingsHelp">
 							<i class="icon-help"></i>
-							<span class="i18n" data-i18n="TOP_TOOLBAR/BUTTON_HELP"></span>
+							<span data-i18n="TOP_TOOLBAR/BUTTON_HELP"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: mobile">
 						<a class="e-link menuitem" href="./?/DesktopVersion/" tabindex="-1">
 							<i class="fontastic">💻</i>
-							<span class="i18n" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></span>
+							<span data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></span>
 						</a>
 					</li>
 					<li class="e-item dividerbar" role="presentation" data-bind="visible: !mobile">
 						<a class="e-link menuitem" href="./?/MobileVersion/" tabindex="-1">
 							<i class="fontastic">📱</i>
-							<span class="i18n" data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></span>
+							<span data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></span>
 						</a>
 					</li>
 					<li class="e-item" role="presentation">
 						<a class="e-link menuitem" href="#" tabindex="-1" data-bind="click: logoutClick">
 							<i class="fontastic">⏻</i>
-							<span class="i18n" data-i18n="GLOBAL/LOGOUT"></span>
+							<span data-i18n="GLOBAL/LOGOUT"></span>
 						</a>
 					</li>
 				</ul>