diff --git a/mail/js/app.js b/mail/js/app.js
index a5bab236aa..13f1e4e9b2 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -228,12 +228,6 @@ app.classes.mail = AppJS.extend(
 				this.smimeAttachmentsCheckerInterval();
 				break;
 			case 'mail.compose':
-				// Set password field of file sharing to empty in
-				// initialization because safari does not respect
-				// autocomplete-off attribute. This hack should be
-				// removed once the issue is solved.
-				var password = this.et2.getWidgetById('password');
-				if (password) password.set_value('');
 				var composeToolbar = this.et2.getWidgetById('composeToolbar');
 				if (composeToolbar._actionManager.getActionById('pgp') &&
 					composeToolbar._actionManager.getActionById('pgp').checked ||