1 --- mutt-1.5.9/compose.c.orig 2005-08-04 10:58:39.282202360 +0000
2 +++ mutt-1.5.9/compose.c 2005-08-04 11:02:58.420807304 +0000
4 if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME))
7 - mvaddstr (HDR_CRYPT, 0, " Security: ");
8 + mvaddstr (HDR_CRYPT, SidebarWidth, " Security: ");
9 else if (msg->security & APPLICATION_SMIME)
10 - mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
11 + mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: ");
12 else if (msg->security & APPLICATION_PGP)
13 - mvaddstr (HDR_CRYPT, 0, " PGP: ");
14 + mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: ");
16 else if ((WithCrypto & APPLICATION_SMIME))
17 - mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
18 + mvaddstr (HDR_CRYPT, SidebarWidth, " S/MIME: ");
19 else if ((WithCrypto & APPLICATION_PGP))
20 - mvaddstr (HDR_CRYPT, 0, " PGP: ");
21 + mvaddstr (HDR_CRYPT, SidebarWidth, " PGP: ");
29 - mvprintw (HDR_TO, 0, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);
30 + mvprintw (HDR_TO, SidebarWidth, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);
31 mutt_paddstr (W, NONULL (msg->env->newsgroups));
32 - mvprintw (HDR_CC, 0, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);
33 + mvprintw (HDR_CC, SidebarWidth, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);
34 mutt_paddstr (W, NONULL (msg->env->followup_to));
35 if (option (OPTXCOMMENTTO))
37 - mvprintw (HDR_BCC, 0, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]);
38 + mvprintw (HDR_BCC, SidebarWidth, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]);
39 mutt_paddstr (W, NONULL (msg->env->x_comment_to));
43 - mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
44 + mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
45 mutt_paddstr (W, NONULL (msg->env->subject));
46 draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
47 - mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
48 + mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
49 mutt_paddstr (W, fcc);
52 --- mutt-1.5.9/Makefile.am.orig 2005-08-04 11:22:12.390377264 +0000
53 +++ mutt-1.5.9/Makefile.am 2005-08-04 11:22:29.806729576 +0000
55 score.c send.c sendlib.c signal.c sort.c \
56 status.c system.c thread.c charset.c history.c lib.c \
57 muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
58 - url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h
59 + url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h \
62 mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
63 $(INTLLIBS) $(LIBICONV) $(LIBGPGME_LIBS)