diff --git a/src/message.c b/src/message.c
index c6bf6da..ed9b532 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1997,11 +1997,13 @@
 			&& curwin->w_lcs_chars.leadmultispace != NULL)
 		{
 		    c = curwin->w_lcs_chars.leadmultispace[multispace_pos++];
-		    if (curwin->w_lcs_chars.leadmultispace[multispace_pos] == NUL)
+		    if (curwin->w_lcs_chars.leadmultispace[multispace_pos]
+									== NUL)
 			multispace_pos = 0;
 		    attr = HL_ATTR(HLF_8);
 		}
-		else if (lead != NULL && s <= lead && curwin->w_lcs_chars.lead)
+		else if (lead != NULL && s <= lead
+					    && curwin->w_lcs_chars.lead != NUL)
 		{
 		    c = curwin->w_lcs_chars.lead;
 		    attr = HL_ATTR(HLF_8);
@@ -2011,14 +2013,6 @@
 		    c = curwin->w_lcs_chars.trail;
 		    attr = HL_ATTR(HLF_8);
 		}
-		else if (list && lead != NULL && s <= lead && in_multispace
-			&& curwin->w_lcs_chars.leadmultispace != NULL)
-		{
-		    c = curwin->w_lcs_chars.leadmultispace[multispace_pos++];
-		    if (curwin->w_lcs_chars.leadmultispace[multispace_pos] == NUL)
-			multispace_pos = 0;
-		    attr = HL_ATTR(HLF_8);
-		}
 		else if (list && in_multispace
 			&& curwin->w_lcs_chars.multispace != NULL)
 		{