From: Richard Russon <rich@flatcap.org>
Date: Mon, 30 May 2016 11:59:30 +0000 (+0100)
Subject: merge: sidebar
X-Git-Tag: neomutt-20160530^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c68719343c86cf2ddefa54d96328afb3ac371e97;p=neomutt

merge: sidebar

 * fix missing TITLE_FMTs
---

c68719343c86cf2ddefa54d96328afb3ac371e97
diff --cc compose.c
index c510ff5c0,86cdfb356..30a5e9216
--- a/compose.c
+++ b/compose.c
@@@ -187,19 -153,11 +187,19 @@@ static void redraw_crypt_lines (HEADER 
  
    if ((WithCrypto & APPLICATION_PGP)
        && (msg->security & APPLICATION_PGP) && (msg->security & SIGN))
 -    printw (TITLE_FMT "%s", _("sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
 +  {
 +    char *s = _(" sign as: ");
-     int offset = HDR_XOFFSET - mbstowcs (NULL, s, 0);
++    int offset = HDR_XOFFSET + SidebarWidth - mbstowcs (NULL, s, 0);
 +    mvprintw (HDR_CRYPTINFO, offset < 0 ? 0 : offset, "%s%s", s,
 +	      PgpSignAs ? PgpSignAs : _("<default>"));
 +  }
  
    if ((WithCrypto & APPLICATION_SMIME)
        && (msg->security & APPLICATION_SMIME) && (msg->security & SIGN)) {
 -      printw (TITLE_FMT "%s", _("sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
 +    char *s = _(" sign as: ");
-     int offset = HDR_XOFFSET - mbstowcs (NULL, s, 0);
++    int offset = HDR_XOFFSET + SidebarWidth - mbstowcs (NULL, s, 0);
 +    mvprintw (HDR_CRYPTINFO, offset < 0 ? 0 : offset, "%s%s", s,
 +	      SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
    }
  
    if ((WithCrypto & APPLICATION_SMIME)