4 files changed, 19 insertions, 0 deletions
diff --git a/pith/mailindx.c b/pith/mailindx.c
index 09cdc2c8..57c9a7ec 100644
--- a/pith/mailindx.c
+++ b/pith/mailindx.c
@@ -5318,6 +5318,7 @@ subj_str(INDEXDATA_S *idata, char *str, size_t strsize, SubjKW kwtype, int openi
     iutf8ncpy(origsubj, sp, len);
 
     origsubj[len] = '\0';
+    replace_tabs_by_space(origsubj);
     removing_trailing_white_space(origsubj);
 
     /*
@@ -6184,6 +6185,7 @@ from_str(IndexColType ctype, INDEXDATA_S *idata, char *str, size_t strsize, ICE_
 	    break;
 	}
     }
+    replace_tabs_by_space(str);
 }
 
 
diff --git a/pith/pine.hlp b/pith/pine.hlp
index ea85d75c..169be4cb 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -179,6 +179,10 @@ Additions include:
 <P>
 
 <UL>
+  <LI> Upgrade UW-IMAP to Panda IMAP from 
+       <A HREF="https://github.com/jonabbey/panda-imap">https://github.com/jonabbey/panda-imap</A>.
+  <LI> Replace tabs by spaces in From and Subject fields to control for
+       size in screen of these fields. Change only in index screen display.
   <LI> Add support to selective expunge through a subcommand of the 
        select-apply commands. Read more in the <A 
        HREF="h_index_cmd_expunge">help</A> for the expunge command.
diff --git a/pith/string.c b/pith/string.c
index 9bd91d6a..c662d6e5 100644
--- a/pith/string.c
+++ b/pith/string.c
@@ -185,6 +185,18 @@ removing_leading_white_space(char *string)
       }
 }
 
+/* replace_embedded_tabs_by_space
+   replace any tab by only one space, when we do not want to see them
+   in the from or subject field.
+ */
+void
+replace_tabs_by_space(char *orig)
+{
+  char *s;
+
+  for(s = orig; s != NULL && *s != '\0' ; s++)
+     if(*s == '\t') *s = ' ';
+}
 
 
 /*----------------------------------------------------------------------  
diff --git a/pith/string.h b/pith/string.h
index 5a3a3bd5..b2e5d43c 100644
--- a/pith/string.h
+++ b/pith/string.h
@@ -90,6 +90,7 @@ void	    sqzspaces(char *);
 void	    sqznewlines(char *);
 void	    removing_leading_white_space(char *);
 void	    removing_trailing_white_space(char *);
+void	    replace_tabs_by_space(char *);
 void	    removing_leading_and_trailing_white_space(char *);
 int 	    removing_double_quotes(char *);
 char	   *skip_white_space(char *);