diff --git a/src/mu-log.c b/src/mu-log.c
index 03f43398..dd43a84d 100644
--- a/src/mu-log.c
+++ b/src/mu-log.c
@@ -90,7 +90,6 @@ mu_log_init_silence (void)
 	return TRUE;
 }
 
-
 static void
 log_handler (const gchar* log_domain, GLogLevelFlags log_level,
 	     const gchar* msg)
@@ -104,18 +103,19 @@ log_handler (const gchar* log_domain, GLogLevelFlags log_level,
 
 gboolean
 mu_log_init_with_fd (int fd, gboolean doclose,
-			     gboolean quiet, gboolean debug)
+		     gboolean quiet, gboolean debug)
 {
 	g_return_val_if_fail (!MU_LOG, FALSE);
 	
         MU_LOG = g_new(MuLog, 1);
 
-        MU_LOG->_fd     = fd;
-	MU_LOG->_quiet  = quiet;
-	MU_LOG->_debug  = debug;
-        MU_LOG->_own    = doclose; /* if we now own the fd, close it
+        MU_LOG->_fd		    = fd;
+	MU_LOG->_quiet		    = quiet;
+	MU_LOG->_newline_before_msg = FALSE;
+	MU_LOG->_debug		    = debug;
+        MU_LOG->_own		    = doclose; /* if we now own the fd, close it
 				    * in _destroy */
-	MU_LOG->_old_log_func =
+	MU_LOG->_old_log_func	    = 
 		g_log_set_default_handler ((GLogFunc)log_handler, NULL);
 	
 	return TRUE;
@@ -257,15 +257,21 @@ log_write (const char* domain, GLogLevelFlags level,
 	if (len < 0)
 		fprintf (stderr, "%s: failed to write to log: %s\n",
 			 __FUNCTION__,  strerror(errno));
-
-	if (!(MU_LOG->_quiet) && (level & G_LOG_LEVEL_MESSAGE))
-		g_print ("mu: %s\n", msg);
 	
+	if (!(MU_LOG->_quiet) && (level & G_LOG_LEVEL_MESSAGE)) {
+		fputs ("mu: ", stdout);
+		fputs (msg,    stdout);
+		fputs ("\n",   stdout);
+		fflush (stdout);
+	}
+		
 	/* for serious errors, log them to stderr as well */
-	if (level & G_LOG_LEVEL_ERROR)
-		g_printerr ("mu: %s\n", msg);
-	else if (level & G_LOG_LEVEL_CRITICAL)
-		g_printerr ("mu: %s\n", msg);
-	else if (level & G_LOG_LEVEL_WARNING)
-		g_printerr ("mu: %s\n", msg);
+	if (level & G_LOG_LEVEL_ERROR ||
+	    level & G_LOG_LEVEL_CRITICAL ||
+	    level & G_LOG_LEVEL_WARNING) {
+		fputs ("mu: ", stderr);
+		fputs (msg,    stderr);
+		fputs ("\n",   stderr);
+		fflush (stderr);
+	}
 }
diff --git a/src/mu-log.h b/src/mu-log.h
index dbe7b787..7db55c83 100644
--- a/src/mu-log.h
+++ b/src/mu-log.h
@@ -70,6 +70,7 @@ gboolean mu_log_init_silence    (void) G_GNUC_WARN_UNUSED_RESULT;
  */
 void mu_log_uninit             (void);
 
+
 G_END_DECLS
 
 #endif /*__MU_LOG_H__*/
diff --git a/src/mu.cc b/src/mu.cc
index 22723c11..7bc02199 100644
--- a/src/mu.cc
+++ b/src/mu.cc
@@ -1,3 +1,5 @@
+/* -*-mode: c++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8-*- */
+
 /*
 ** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **