Andreas Krennmair:

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index ef7ee18..5b163dc 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -17,6 +17,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
@@ -61,6 +65,9 @@ enum
   HDR_REPLYTO,
   HDR_FCC,
 
+#ifdef MIXMASTER  
+  HDR_MIX,
+#endif
 
   HDR_CRYPT,
   HDR_CRYPTINFO,
@@ -71,7 +78,11 @@ enum
   HDR_XCOMMENTTO,
 #endif
 
+#ifndef USE_NNTP
   HDR_ATTACH  = (HDR_FCC + 5) /* where to start printing the attachments */
+#else
+  HDR_ATTACH  = (HDR_FCC + 7) 
+#endif
 };
 
 #define HDR_XOFFSET 14
@@ -179,11 +190,11 @@ static void redraw_crypt_lines (HEADER *msg)
   clrtoeol ();
   if ((WithCrypto & APPLICATION_PGP)
       && msg->security & APPLICATION_PGP  && msg->security & SIGN)
-    printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
+    printw ("%s%s", _("     sign as: "), PgpSignAs ? PgpSignAs : _("<default>"));
 
   if ((WithCrypto & APPLICATION_SMIME)
      && msg->security & APPLICATION_SMIME  && msg->security & SIGN) {
-      printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
+      printw ("%s%s", _("     sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("<default>"));
   }
 
   if ((WithCrypto & APPLICATION_SMIME)
@@ -205,7 +216,7 @@ static void redraw_mix_line (LIST *chain)
   int c;
   char *t;
 
-  mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
+  mvaddstr (HDR_MIX, SidebarWidth,     "         Mix: ");
 
   if (!chain)
   {