diff --git a/tools/errmsg.cpp b/tools/errmsg.cpp
index 416f5b3be..95a9cdaa3 100644
--- a/tools/errmsg.cpp
+++ b/tools/errmsg.cpp
@@ -148,11 +148,14 @@ void Message::generateCode(std::ostream &ostr) const
     if (! _par1.empty())
         ostr << ", const std::string &" << _par1;
     ostr << ")\n";
-    ostr << "    { return msg1(tokenizer, Location) + " << msg(true) << "; }" << std::endl;
+    ostr << "    {\n";
+	ostr << "        return msg1(tokenizer, Location) + " << msg(true) << ";\n";
+    ostr << "    }\n";
 
     // Settings..
     ostr << "    static bool " << _funcname << "(const Settings &s)" << std::endl;
-    ostr << "    { return ";
+    ostr << "    {\n";
+	ostr << "        return ";
     if (_settings == 0)
         ostr << "true";
     else
@@ -164,7 +167,8 @@ void Message::generateCode(std::ostream &ostr) const
         if (_settings & STYLE)
             ostr << "s._checkCodingStyle";
     }
-    ostr << "; }" << std::endl << std::endl;
+    ostr << ";\n";
+	ostr << "    }\n\n";
 }
 
 void Message::generateDoc(std::ostream &ostr, unsigned int i) const