diff --git a/src/ChangeLog b/src/ChangeLog
index 528d6eb9..3df83691 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-04  Darshit Shah <darnir@gmail.com>
+
+	* init.c (cmd_string_uppercase): Fix issue that cased invalid headers
+	when converting to uppercase.
+
 2013-05-01  Gijs van Tulder  <gvtulder@gmail.com>
 
 	* retr.c (retrieve_url): New variable `saved_method'.
diff --git a/src/init.c b/src/init.c
index b4336502..0c418255 100644
--- a/src/init.c
+++ b/src/init.c
@@ -970,8 +970,8 @@ cmd_string_uppercase (const char *com, const char *val, void *place)
   if (!ret || q == NULL)
     return false;
 
-  while (*q)
-    *q++ = c_toupper (*q);
+  for ( ;*q; *q++)
+    *q = c_toupper (*q);
 
   return true;
 }