diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 7b2709028a..b5f9aff667 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -3193,6 +3193,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 				self::callWizard($e->getMessage().' '.lang('Please configure your S/MIME certificate in Encryption tab located at Edit Account dialog.'));
 			}
 			Framework::message($e->getMessage());
+			$configs = Api\Config::read('mail');
 			// do NOT include any default CSS
 			$smimeHtml = $this->get_email_header().
 			'<div class="smime-message">'.lang("This message is smime encrypted and password protected.").'</div>'.
@@ -3202,7 +3203,10 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 						'<input type="password" placeholder="'.lang("Please enter password").'" name="smime_passphrase"/>'.
 						'<input type="submit" value="'.lang("submit").'"/>'.
 						'<div style="margin-top:10px;position:relative;text-align:center;margin-left:-15px;">'.
-							lang("Remember the password for ").'<input name="smime_pass_exp" type="number" max="60" min="1" placeholder="10" value="'.$this->mail_bo->mailPreferences['smime_pass_exp'].'"/> '.lang("minutes.").
+							lang("Remember the password for ").
+								'<input name="smime_pass_exp" type="number" max="480" min="1" placeholder="'.
+								(is_array($configs) && $configs['smime_pass_exp'] ? $configs['smime_pass_exp'] : "10").
+								'" value="'.$this->mail_bo->mailPreferences['smime_pass_exp'].'"/> '.lang("minutes.").
 						'</div>'.
 					'</div>'.
 			'</form>';
diff --git a/mail/templates/default/config.xet b/mail/templates/default/config.xet
index 54e7906ddc..c312d63b8d 100644
--- a/mail/templates/default/config.xet
+++ b/mail/templates/default/config.xet
@@ -85,6 +85,10 @@
 					<description value="Quota limit warning in MegaByte (recommended value is 30 MB)."/>
 					<textbox id="newsettings[quota_limit_warning]"/>
 				</row>
+				<row>
+					<description value="Default value for remembering S/MIME passphrase in minutes"/>
+					<textbox id="newsettings[smime_pass_exp]"/>
+				</row>
 			</rows>
 		</grid>
 	</template>