diff --git a/src/mu-config.c b/src/mu-config.c
index 556e9394..577c7981 100644
--- a/src/mu-config.c
+++ b/src/mu-config.c
@@ -276,7 +276,7 @@ gboolean
 mu_config_init (MuConfigOptions *opts, int *argcp, char ***argvp)
 {
 	g_return_val_if_fail (opts, FALSE);	
-	memset (opts, 0, sizeof(MuConfigOptions));
+	memset (opts, 0, sizeof(MuConfigOptions));	
 
 	/* defaults are set in parse_params */
 	
diff --git a/src/mu.cc b/src/mu.cc
index 24f661cd..a90ee0d8 100644
--- a/src/mu.cc
+++ b/src/mu.cc
@@ -21,8 +21,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <string.h>
 #include <stdio.h> /* for fileno() */
+#include <locale.h> /* for setlocale() */
 
 #include "mu-config.h"
 #include "mu-cmd.h"
@@ -52,9 +52,11 @@ main (int argc, char *argv[])
 {
 	MuConfigOptions config;
 	gboolean rv;
+
+	setlocale (LC_ALL, "");
 	
 	g_type_init ();
-
+	
 	if (!mu_config_init (&config, &argc, &argv))
 		return 1;