Mixmaster user interface beautification.

1 files changed, 9 insertions, 5 deletions

diff --git a/compose.c b/compose.c
index 4aa5bdf9..40255811 100644
--- a/compose.c
+++ b/compose.c
@@ -225,27 +225,31 @@ static int pgp_send_menu (int bits, int *redraw)
 static void redraw_mix_line (LIST *chain)
 {
   int c;
+  char *t;
 
   mvaddstr (HDR_MIX, 0,     "     Mix: ");
 
   if (!chain)
   {
-    addstr ("no");
+    addstr ("<no chain defined>");
     clrtoeol ();
     return;
   }
   
   for (c = 12; chain; chain = chain->next)
   {
-    if (c + mutt_strlen ((char *) chain->data) + 2 >= COLS)
+    t = chain->data;
+    if (t && t[0] == '0' && t[1] == '\0')
+      t = "<random>";
+    
+    if (c + mutt_strlen (t) + 2 >= COLS)
       break;
 
-    
-    addstr (NONULL((char *) chain->data));
+    addstr (NONULL(t));
     if (chain->next)
       addstr (", ");
 
-    c += mutt_strlen ((char *) chain->data) + 2;
+    c += mutt_strlen (t) + 2;
   }
 }
 #endif