        snprintf (dest, destlen, fmt, hdr->msgno + 1);
        break;
  
-@@ -408,7 +442,10 @@
- 	if (do_locales)
- 	  setlocale (LC_TIME, "C");
+@@ -425,7 +459,10 @@
+         if (!do_locales)
+           setlocale (LC_TIME, "");
  
 -	mutt_format_s (dest, destlen, prefix, buf2);
 +	colorlen = add_index_color(dest, destlen, flags, MT_COLOR_INDEX_DATE);

 
   memset(&mbstate1, 0, sizeof (mbstate1));
   memset(&mbstate2, 0, sizeof (mbstate2));
@@ -741,7 +742,15 @@
       k = (k == (size_t)(-1)) ? 1 : n;
       wc = replacement_char ();
     }
-    if (arboreal && wc < M_TREE_MAX)
+    if (escaped) {
+      escaped = 0;
+      w = 0;
+    }
+    else if (arboreal && wc == M_SPECIAL_INDEX) {
+      escaped = 1;
+      w = 0;
+    }
+    else if (arboreal && wc < M_TREE_MAX)
       w = 1; /* hack */
     else
     {
Only in new/mutt: curs_lib.c.orig
diff -aur src/mutt/doc/manual.xml.head new/mutt/doc/manual.xml.head
--- src/mutt/doc/manual.xml.head	2015-07-10 22:59:35.640060082 +0300
+++ new/mutt/doc/manual.xml.head	2015-07-10 22:49:35.176704812 +0300
@@ -2582,7 +2582,7 @@
 
 <command>color</command>
 <arg choice="plain">

     }
     else
     {
@@ -312,7 +349,7 @@
       menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
       menu_pad_string (menu, buf, sizeof (buf));
       mutt_window_move (menu->indexwin, menu->oldcurrent + menu->offset - menu->top, 3);
-      print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+      print_enriched_string (menu->oldcurrent, menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
     }
 
     /* now draw it in the new location */
@@ -324,14 +361,14 @@
     /* erase the current indicator */
     menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
     menu_pad_string (menu, buf, sizeof (buf));
-    print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+    print_enriched_string (menu->oldcurrent, menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
 
     /* now draw the new one to reflect the change */
     menu_make_entry (buf, sizeof (buf), menu, menu->current);
     menu_pad_string (menu, buf, sizeof (buf));
     SETCOLOR(MT_COLOR_INDICATOR);
     mutt_window_move (menu->indexwin, menu->current + menu->offset - menu->top, 0);
-    print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
+    print_enriched_string (menu->current, menu->color(menu->current), (unsigned char *) buf, 0);
   }
   menu->redraw &= REDRAW_STATUS;
   NORMAL_COLOR;
@@ -353,10 +390,10 @@
     ATTRSET(attr);
     addch (' ');
     menu_pad_string (menu, buf, sizeof (buf));
-    print_enriched_string (attr, (unsigned char *) buf, 1);
+    print_enriched_string (menu->current, attr, (unsigned char *) buf, 1);
   }
