diff --git a/dev/View/Popup/Account.js b/dev/View/Popup/Account.js
index bae194ee2..292fbc24b 100644
--- a/dev/View/Popup/Account.js
+++ b/dev/View/Popup/Account.js
@@ -20,9 +20,7 @@ class AccountPopupView extends AbstractViewPopup {
 
 			submitRequest: false,
 			submitError: '',
-			submitErrorAdditional: '',
-
-			emailFocus: false
+			submitErrorAdditional: ''
 		});
 
 		this.email.subscribe(() => this.emailError(false));
@@ -84,10 +82,6 @@ class AccountPopupView extends AbstractViewPopup {
 			this.email(account.email);
 		}
 	}
-
-	onShowWithDelay() {
-		this.emailFocus(true);
-	}
 }
 
 export { AccountPopupView, AccountPopupView as default };
diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js
index 26b1e617b..2c8cb6fa1 100644
--- a/dev/View/Popup/AdvancedSearch.js
+++ b/dev/View/Popup/AdvancedSearch.js
@@ -12,8 +12,6 @@ class AdvancedSearchPopupView extends AbstractViewPopup {
 		super('AdvancedSearch');
 
 		this.addObservables({
-			fromFocus: false,
-
 			from: '',
 			to: '',
 			subject: '',
@@ -142,18 +140,12 @@ class AdvancedSearchPopupView extends AbstractViewPopup {
 		this.hasAttachment(false);
 		this.starred(false);
 		this.unseen(false);
-
-		this.fromFocus(true);
 	}
 
 	onShow(search) {
 		this.clearPopup();
 		this.parseSearchStringValue(search);
 	}
-
-	onShowWithDelay() {
-		this.fromFocus(true);
-	}
 }
 
 export { AdvancedSearchPopupView, AdvancedSearchPopupView as default };
diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js
index c80371b76..ee8f627a7 100644
--- a/dev/View/Popup/FolderCreate.js
+++ b/dev/View/Popup/FolderCreate.js
@@ -18,7 +18,6 @@ class FolderCreatePopupView extends AbstractViewPopup {
 
 		this.addObservables({
 			folderName: '',
-			folderNameFocused: false,
 
 			selectedParentValue: UNUSED_OPTION_VALUE
 		});
@@ -59,22 +58,17 @@ class FolderCreatePopupView extends AbstractViewPopup {
 	}
 
 	simpleFolderNameValidation(sName) {
-		return /^[^\\/]+$/g.test(sName.trim());
+		return /^[^\\/]+$/g.test(sName);
 	}
 
 	clearPopup() {
 		this.folderName('');
 		this.selectedParentValue('');
-		this.folderNameFocused(false);
 	}
 
 	onShow() {
 		this.clearPopup();
 	}
-
-	onShowWithDelay() {
-		this.folderNameFocused(true);
-	}
 }
 
 export { FolderCreatePopupView, FolderCreatePopupView as default };
diff --git a/dev/View/Popup/NewOpenPgpKey.js b/dev/View/Popup/NewOpenPgpKey.js
index dfed2e1db..efdabbb2d 100644
--- a/dev/View/Popup/NewOpenPgpKey.js
+++ b/dev/View/Popup/NewOpenPgpKey.js
@@ -11,7 +11,6 @@ class NewOpenPgpKeyPopupView extends AbstractViewPopup {
 
 		this.addObservables({
 			email: '',
-			emailFocus: '',
 			emailError: false,
 
 			name: '',
@@ -101,10 +100,6 @@ class NewOpenPgpKeyPopupView extends AbstractViewPopup {
 	onShow() {
 		this.clearPopup();
 	}
-
-	onShowWithDelay() {
-		this.emailFocus(true);
-	}
 }
 
 export { NewOpenPgpKeyPopupView, NewOpenPgpKeyPopupView as default };
diff --git a/dev/View/Popup/Template.js b/dev/View/Popup/Template.js
index aa700ff64..60758a808 100644
--- a/dev/View/Popup/Template.js
+++ b/dev/View/Popup/Template.js
@@ -20,7 +20,6 @@ class TemplatePopupView extends AbstractViewPopup {
 
 			name: '',
 			nameError: false,
-			nameFocus: false,
 
 			body: '',
 			bodyLoading: false,
@@ -144,10 +143,6 @@ class TemplatePopupView extends AbstractViewPopup {
 			this.editorSetBody('');
 		}
 	}
-
-	onShowWithDelay() {
-		this.nameFocus(true);
-	}
 }
 
 export { TemplatePopupView, TemplatePopupView as default };
diff --git a/dev/View/Popup/TwoFactorTest.js b/dev/View/Popup/TwoFactorTest.js
index 6b8949255..5977a6e26 100644
--- a/dev/View/Popup/TwoFactorTest.js
+++ b/dev/View/Popup/TwoFactorTest.js
@@ -9,7 +9,6 @@ class TwoFactorTestPopupView extends AbstractViewPopup {
 
 		this.addObservables({
 			code: '',
-			codeFocused: false,
 			codeStatus: null,
 
 			testing: false
@@ -36,7 +35,6 @@ class TwoFactorTestPopupView extends AbstractViewPopup {
 
 	clearPopup() {
 		this.code('');
-		this.codeFocused(false);
 		this.codeStatus(null);
 		this.testing(false);
 
@@ -48,10 +46,6 @@ class TwoFactorTestPopupView extends AbstractViewPopup {
 
 		this.koTestedTrigger = koTestedTrigger;
 	}
-
-	onShowWithDelay() {
-		this.codeFocused(true);
-	}
 }
 
 export { TwoFactorTestPopupView, TwoFactorTestPopupView as default };
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 123bf6d64..5f6dc2710 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
@@ -22,8 +22,9 @@
 					<label class="control-label" data-i18n="GLOBAL/EMAIL"></label>
 					<div class="controls">
 						<label style="margin-top: 5px;" data-bind="visible: !isNew()"><strong data-bind="text: email"></strong></label>
-						<input type="email" class="inputEmail input-xlarge" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-bind="visible: isNew, textInput: email, onEnter: addAccountCommand, hasfocus: emailFocus" />
+						<input type="email" class="inputEmail input-xlarge"
+							autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							data-bind="visible: isNew, textInput: email, onEnter: addAccountCommand" />
 					</div>
 				</div>
 				<div class="control-group" data-bind="css: {'error': passwordError}">
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 3e3717cf0..45cbe1bcd 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
@@ -12,8 +12,9 @@
 							<span data-i18n="GLOBAL/FROM"></span>
 						</label>
 						<div class="controls">
-							<input type="text" class="uiInput inputFrom" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-								data-bind="value: from, onEnter: searchCommand, hasfocus: fromFocus, onEsc: cancelCommand" />
+							<input type="text" class="uiInput inputFrom"
+								autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+								data-bind="value: from, onEnter: searchCommand, onEsc: cancelCommand" />
 						</div>
 					</div>
 					<div class="control-group">
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 b5b0e353c..637dd5b43 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
@@ -12,8 +12,9 @@
 						<span data-i18n="GLOBAL/NAME"></span>
 					</label>
 					<div class="controls">
-						<input type="text" class="uiInput inputName" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-bind="textInput: folderName, hasfocus: folderNameFocused, onEnter: createFolderCommand" />
+						<input type="text" class="uiInput inputName"
+							autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							data-bind="textInput: folderName, onEnter: createFolderCommand" />
 					</div>
 				</div>
 				<div class="control-group">
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 ba4b0c18a..0e3719cc3 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
@@ -15,8 +15,8 @@
 					<label class="control-label" data-i18n="GLOBAL/EMAIL"></label>
 					<div class="controls">
 						<input type="email" class="inputEmail input-large"
-							autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-bind="value: email, hasfocus: emailFocus" />
+							autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							data-bind="value: email" />
 					</div>
 				</div>
 				<div class="control-group">
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 6f368b42b..b1fbbdda5 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
@@ -17,8 +17,9 @@
 				<div class="control-group" data-bind="css: {'error': nameError}">
 					<label class="control-label" data-i18n="GLOBAL/NAME"></label>
 					<div class="controls">
-						<input type="text" class="inputName input-xlarge" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-bind="textInput: name, onEnter: addTemplateCommand, hasfocus: nameFocus" />
+						<input type="text" class="inputName input-xlarge"
+							autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							data-bind="textInput: name, onEnter: addTemplateCommand" />
 					</div>
 				</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 59690951e..bb3c48c76 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
@@ -13,8 +13,8 @@
 					</label>
 					<div class="controls">
 						<input type="text" class="uiInput inputName"
-							autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-bind="textInput: code, hasfocus: codeFocused, onEnter: testCodeCommand" />
+							autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							data-bind="textInput: code, onEnter: testCodeCommand" />
 					</div>
 				</div>
 			</div>