- int cols = COLS - shift;
-
- mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
- s[n - 1] = 0;
+ int cols;
+ char* tmpbuf = safe_malloc (n);
+ if (option(OPTMBOXPANE))
+ cols = COLS - shift - SidebarWidth;
+ else
+ cols = COLS - shift;
+ mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, strlen (s), 1);
+ tmpbuf[n - 1] = 0;
+ snprintf(s,n,"%s",tmpbuf); /* overkill */
+ FREE(&tmpbuf);