X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=95d1f08694f71fa23ea51b788490527e581c176a;hp=0e975e430466f3c54b7f1bc91fb62cfd41289fc9;hb=44f97e3b57de6d306b9a1a9b58f992b80e920213;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/pager.c b/pager.c
index 0e975e4..95d1f08 100644
--- a/pager.c
+++ b/pager.c
@@ -1042,8 +1042,11 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
   wchar_t wc;
   mbstate_t mbstate;
 
-  int wrap_cols = COLS - WrapMargin - SidebarWidth;
-  
+  int wrap_cols = COLS;
+  if (!(flags & (M_SHOWFLAT)))
+    wrap_cols -= WrapMargin;
+  wrap_cols -= SidebarWidth;
+
   if (wrap_cols <= 0)
     wrap_cols = COLS;
   
@@ -1770,13 +1773,12 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       /* redraw the pager_index indicator, because the
        * flags for this message might have changed. */
       menu_redraw_current (index);
-	  draw_sidebar(MENU_PAGER);
+      draw_sidebar(MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
-		  SidebarWidth);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),option(OPTSTATUSONTOP)?0:SidebarWidth);
       SETCOLOR (MT_COLOR_STATUS);
-      mutt_paddstr (COLS-SidebarWidth, buffer);
+      mutt_paddstr (COLS-(option(OPTSTATUSONTOP)?0:SidebarWidth), buffer);
       SETCOLOR (MT_COLOR_NORMAL);
     }
 	/* if we're not using the index, update every time */
@@ -2745,7 +2747,9 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
 	  case OP_SIDEBAR_SCROLL_UP:
 	  case OP_SIDEBAR_SCROLL_DOWN:
 	  case OP_SIDEBAR_NEXT:
+	  case OP_SIDEBAR_NEXT_NEW:
 	  case OP_SIDEBAR_PREV:
+	  case OP_SIDEBAR_PREV_NEW:
 	    scroll_sidebar(ch, MENU_PAGER);
 		break;
       default: