X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=1dc9f3cfdd714c1e5b5baaefb74eea171d46c0d3;hp=a4f4a899c7ab7f35e5fb8930cadf5af6a4be739c;hb=011fac630357428e59d7eae29888d905255c9580;hpb=d9b1a33529f8cb9b45f7c45090d7b48c377f8df7

diff --git a/src/modest-init.c b/src/modest-init.c
index a4f4a89..1dc9f3c 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -602,11 +602,13 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-	const gchar *lc_messages = getenv ("LC_MESSAGES");
+	const gchar *lc_messages = setlocale (LC_MESSAGES, NULL);
 
 	if (!lc_messages) {
 		setenv ("LANGUAGE", "en_GB", 1);
 		setenv ("LC_MESSAGES", "en_GB", 1);
+	} else {
+		setenv ("LC_MESSAGES", lc_messages, 1);
 	}
 
 	bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
@@ -758,7 +760,7 @@ init_default_settings (ModestConf *conf)
 		modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
 
 	if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_SIZE_LIMIT, NULL))
-		modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, 1000, NULL);
+		modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, 100, NULL);
 
 	if (!modest_conf_key_exists (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, NULL))
 		modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, FALSE, NULL);