-@@ -115,16 +146,16 @@ static void redraw_crypt_lines (HEADER *
- if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME))
- {
- if (!msg->security)
-- mvaddstr (HDR_CRYPT, 0, "Security: ");
-+ mvaddstr (HDR_CRYPT, 0, " Security: ");
- else if (msg->security & APPLICATION_SMIME)
-- mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
-+ mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
- else if (msg->security & APPLICATION_PGP)
-- mvaddstr (HDR_CRYPT, 0, " PGP: ");
-+ mvaddstr (HDR_CRYPT, 0, " PGP: ");
+@@ -112,7 +143,7 @@
+ {
+ int off = 0;
+
+- mvaddstr (HDR_CRYPT, 0, "Security: ");
++ mvprintw (HDR_CRYPT, 0, TITLE_FMT, "Security: ");
+
+ if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
+ {
+@@ -148,12 +179,15 @@
+ clrtoeol ();
+
+ if ((WithCrypto & APPLICATION_PGP)
+- && msg->security & APPLICATION_PGP && msg->security & SIGN)
+- printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
++ && msg->security & APPLICATION_PGP && msg->security & SIGN) {
++ printw (TITLE_FMT, _(" sign as: "));
++ printw ("%s", PgpSignAs ? PgpSignAs : _("<default>"));
++ }
+
+ if ((WithCrypto & APPLICATION_SMIME)
+ && msg->security & APPLICATION_SMIME && msg->security & SIGN) {
+- printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
++ printw (TITLE_FMT, _(" sign as: "));
++ printw ("%s", SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));