X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fhdrline.c;h=879a67fa95f510ea77c7f51f3e9f67aff31cde4c;hb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b;hp=cb5a5f400c2a3ea7db71c944927ea4fdea5dc2ce;hpb=6896715a0d62173a620b2377dba8e6d2058c1ee2;p=apps%2Fmadmutt.git

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index cb5a5f4..879a67f 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -706,12 +706,11 @@ static const char *hdr_format_str (char *dest,
     break;
   }
 
-  if (optional)
-    m_strformat(dest, destlen, ifstr, hdr_format_str, data, flags);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elstr, hdr_format_str, data, flags);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, optional ? ifstr: elstr,
+                hdr_format_str, data, flags);
 
-  return (src);
+  return src;
 #undef THREAD_NEW
 #undef THREAD_OLD
 }