merge: sidebar

 * fix missing TITLE_FMTs

diff --cc compose.c
index c510ff5c0a7ae5a362ac0dcac2f656d347ae91b5,86cdfb3567f879e6d3c5872f5abe4a94212c7fe1..30a5e921644423abb2e98cea973c5c07849a85d4
--- 1/compose.c
--- 2/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)