Rocco Rutte:

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 2e34fad..b01619f 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1026,10 +1026,10 @@ void mutt_FormatString (char *dest,             /* output buffer */
        ch = *src++; /* pad char */
        /* calculate space left on line.  if we've already written more data
           than will fit on the line, ignore the rest of the line */
-       if ( DrawFullLine )
+       if ( DrawFullLine  || option(OPTSTATUSONTOP))
          count = (COLS < destlen ? COLS : destlen);
        else
-         count = ((COLS) < destlen ? (COLS) : destlen);
+         count = ((COLS-SidebarWidth) < destlen ? (COLS - SidebarWidth) : destlen);
        if (count > col)
        {
          count -= col; /* how many columns left on this line */
@@ -1329,8 +1329,7 @@ int state_printf (STATE *s, const char *fmt, ...)
 void state_mark_attach (STATE *s)
 {
   if ((s->flags & M_DISPLAY) && !mutt_strcmp (Pager, "builtin"))
-    //state_puts (AttachmentMarker, s);
-    ;
+    state_puts (AttachmentMarker, s);
 }
 
 void state_attach_puts (const char *t, STATE *s)