X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=b01619f6c29984e5ab1277ec10d03dd514531924;hp=2e34fadc7fdfc0a8eed9b476788731932d82e55c;hb=1c068b6a0b9c781e97d565f1d5ed9ef8913566da;hpb=b661011c5210796beaf103676c0d24b87f1a2787

diff --git a/muttlib.c b/muttlib.c
index 2e34fad..b01619f 100644
--- 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)