diff --git a/po/fr.po b/po/fr.po
index 73ef4cb..8d435df 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mailer 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 18:28+0100\n"
+"POT-Creation-Date: 2011-12-10 18:36+0100\n"
 "PO-Revision-Date: 2010-10-02 23:25+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: French\n"
@@ -145,40 +145,40 @@ msgstr ""
 msgid "Followup-To:"
 msgstr "Suivre sur:"
 
-#: ../src/compose.c:248
+#: ../src/compose.c:252
 msgid " - Compose"
 msgstr " - Composer"
 
-#: ../src/compose.c:266
+#: ../src/compose.c:270
 msgid "From: "
 msgstr "De: "
 
-#: ../src/compose.c:330
+#: ../src/compose.c:334
 msgid "Subject: "
 msgstr "Sujet: "
 
-#: ../src/compose.c:597
+#: ../src/compose.c:601
 msgid "Attach file..."
 msgstr "Joindre un fichier..."
 
-#: ../src/compose.c:685 ../src/compose.c:689 ../src/mailer.c:994
-#: ../src/mailer.c:998
+#: ../src/compose.c:689 ../src/compose.c:693 ../src/mailer.c:995
+#: ../src/mailer.c:999
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/compose.c:817
+#: ../src/compose.c:821
 msgid "Sending mail..."
 msgstr "Envoi du message..."
 
-#: ../src/compose.c:824
+#: ../src/compose.c:828
 msgid "Progress: "
 msgstr "Progression : "
 
-#: ../src/compose.c:1088 ../src/compose.c:1097
+#: ../src/compose.c:1092 ../src/compose.c:1101
 msgid "Warning"
 msgstr "Attention"
 
-#: ../src/compose.c:1091
+#: ../src/compose.c:1095
 msgid ""
 "There are unsaved changes.\n"
 "Are you sure you want to close?"
@@ -298,59 +298,59 @@ msgstr "Imprimer"
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/mailer.c:375
-msgid "Mailer"
-msgstr "Mailer"
+#: ../src/mailer.c:379
+msgid " - Folders"
+msgstr " - Dossiers"
 
-#: ../src/mailer.c:378 ../src/mailer.c:608
-msgid "Folders"
-msgstr "Dossiers"
-
-#: ../src/mailer.c:429
+#: ../src/mailer.c:430
 msgid "Message list"
 msgstr "Liste des messages"
 
-#: ../src/mailer.c:459
+#: ../src/mailer.c:460
 msgid "Message"
 msgstr "Message"
 
-#: ../src/mailer.c:496 ../src/mailer.c:1737
+#: ../src/mailer.c:497 ../src/mailer.c:1742
 msgid "Plug-ins"
 msgstr "Greffons"
 
-#: ../src/mailer.c:665
+#: ../src/mailer.c:609
+msgid "Folders"
+msgstr "Dossiers"
+
+#: ../src/mailer.c:666
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../src/mailer.c:667
+#: ../src/mailer.c:668
 msgid "From"
 msgstr "De"
 
-#: ../src/mailer.c:669
+#: ../src/mailer.c:670
 msgid "To"
 msgstr "À"
 
-#: ../src/mailer.c:671
+#: ../src/mailer.c:672
 msgid "Date"
 msgstr "Date"
 
-#: ../src/mailer.c:785
+#: ../src/mailer.c:786
 msgid " Subject: "
 msgstr " Sujet: "
 
-#: ../src/mailer.c:786
+#: ../src/mailer.c:787
 msgid " From: "
 msgstr " De: "
 
-#: ../src/mailer.c:787
+#: ../src/mailer.c:788
 msgid " To: "
 msgstr " À: "
 
-#: ../src/mailer.c:788
+#: ../src/mailer.c:789
 msgid " Date: "
 msgstr " Date: "
 
-#: ../src/mailer.c:1126
+#: ../src/mailer.c:1127
 msgid ""
 "The messages selected will be deleted.\n"
 "Continue?"
@@ -358,147 +358,150 @@ msgstr ""
 "Les messages sélectionnés vont être effacés.\n"
 "Continuer?"
 
-#: ../src/mailer.c:1284
+#: ../src/mailer.c:1285
 msgid "Mailer - View source"
 msgstr "Mailer - Source"
 
-#: ../src/mailer.c:1359
+#: ../src/mailer.c:1360
 msgid "Re: "
 msgstr "Re: "
 
-#: ../src/mailer.c:1471
+#: ../src/mailer.c:1472
 msgid "translator-credits"
 msgstr "Pierre Pronchery <khorben@defora.org>"
 
-#: ../src/mailer.c:1566
+#: ../src/mailer.c:1567
 msgid "Mailer preferences"
 msgstr "Préférences de Mailer"
 
-#: ../src/mailer.c:1637 ../src/mailer.c:1720
+#: ../src/mailer.c:1642 ../src/mailer.c:1725
 msgid "Enabled"
 msgstr "Actif"
 
-#: ../src/mailer.c:1641 ../src/mailer.c:1726
+#: ../src/mailer.c:1646 ../src/mailer.c:1731
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/mailer.c:1645
+#: ../src/mailer.c:1650
 msgid "Type"
 msgstr "Type"
 
-#: ../src/mailer.c:1669
+#: ../src/mailer.c:1674
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../src/mailer.c:1684
+#: ../src/mailer.c:1689
 msgid "Messages font:"
 msgstr "Police des messages:"
 
-#: ../src/mailer.c:1694
+#: ../src/mailer.c:1699
 msgid "Display"
 msgstr "Affichage"
 
-#: ../src/mailer.c:1861
+#: ../src/mailer.c:1866
 msgid "No account plug-in available"
 msgstr "Aucun greffon de compte disponible"
 
-#: ../src/mailer.c:2016 ../src/mailer.c:2304
+#: ../src/mailer.c:2021 ../src/mailer.c:2309
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: ../src/mailer.c:2023
+#: ../src/mailer.c:2028
 msgid "Your name"
 msgstr "Votre nom"
 
-#: ../src/mailer.c:2030
+#: ../src/mailer.c:2035
 msgid "e-mail address"
 msgstr "Adresse e-mail"
 
-#: ../src/mailer.c:2037
+#: ../src/mailer.c:2042
 msgid "Type of account"
 msgstr "Type de compte"
 
-#: ../src/mailer.c:2193
+#: ../src/mailer.c:2198
 msgid "Choose file"
 msgstr "Choisir un fichier"
 
-#: ../src/mailer.c:2375
+#: ../src/mailer.c:2380
 msgid "hidden"
 msgstr "masqué"
 
-#: ../src/mailer.c:2409
+#: ../src/mailer.c:2414
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/mailer.c:2409
+#: ../src/mailer.c:2414
 msgid "No"
 msgstr "Non"
 
-#: ../src/mailer.c:2437
+#: ../src/mailer.c:2442
 msgid "Account type "
 msgstr "Type de compte "
 
-#: ../src/mailer.c:2438
+#: ../src/mailer.c:2443
 msgid " active\n"
 msgstr " actif\n"
 
-#: ../src/mailer.c:2500
+#: ../src/mailer.c:2505
 msgid "Edit account: "
 msgstr "Modification du compte: "
 
-#: ../src/mailer.c:2522
+#: ../src/mailer.c:2527
 msgid "Account name:"
 msgstr "Nom du compte :"
 
-#: ../src/mailer.c:2531
+#: ../src/mailer.c:2536
 msgid "Identity:"
 msgstr "Identité :"
 
-#: ../src/mailer.c:2536
+#: ../src/mailer.c:2541
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/mailer.c:2547
+#: ../src/mailer.c:2552
 msgid "Address:"
 msgstr "Adresse :"
 
-#: ../src/mailer.c:2558
+#: ../src/mailer.c:2563
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: ../src/mailer.c:2571
+#: ../src/mailer.c:2576
 msgid "Account"
 msgstr "Compte"
 
-#: ../src/mailer.c:2576
+#: ../src/mailer.c:2581
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../src/mailer.c:2631
+#: ../src/mailer.c:2636
 msgid "An error occured while saving preferences"
 msgstr "Une erreur est survenue pendant la sauvegarde des préférences"
 
-#: ../src/mailer.c:2925 ../src/mailer.c:2929
+#: ../src/mailer.c:2930 ../src/mailer.c:2934
 msgid "Question"
 msgstr "Question"
 
-#: ../src/mailer.c:2996
+#: ../src/mailer.c:3001
 #, c-format
 msgid "%s/%s: %d %s"
 msgstr "%s/%s: %d %s"
 
-#: ../src/mailer.c:2999
+#: ../src/mailer.c:3004
 msgid "messages"
 msgstr "messages"
 
-#: ../src/mailer.c:2999
+#: ../src/mailer.c:3004
 msgid "message"
 msgstr "message"
 
-#: ../src/mailer.c:3002
+#: ../src/mailer.c:3007
 msgid "Ready"
 msgstr "Prêt"
 
 #: ../src/main.c:44
 msgid "Usage: mailer\n"
 msgstr "Usage: mailer\n"
+
+#~ msgid "Mailer"
+#~ msgstr "Mailer"
diff --git a/src/compose.c b/src/compose.c
index c1b4d0c..5984c91 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -243,7 +243,11 @@ Compose * compose_new(Config * config)
 	group = gtk_accel_group_new();
 	compose->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_add_accel_group(GTK_WINDOW(compose->window), group);
+#ifndef EMBEDDED
 	gtk_window_set_default_size(GTK_WINDOW(compose->window), 512, 384);
+#else
+	gtk_window_set_default_size(GTK_WINDOW(compose->window), 200, 300);
+#endif
 	gtk_window_set_title(GTK_WINDOW(compose->window),
 			_(PACKAGE " - Compose"));
 #if GTK_CHECK_VERSION(2, 6, 0)
diff --git a/src/mailer.c b/src/mailer.c
index ea2252f..e191a94 100644
--- a/src/mailer.c
+++ b/src/mailer.c
@@ -372,10 +372,11 @@ Mailer * mailer_new(void)
 	gtk_window_add_accel_group(GTK_WINDOW(mailer->fo_window), group);
 #ifndef EMBEDDED
 	gtk_window_set_default_size(GTK_WINDOW(mailer->fo_window), 800, 600);
-	gtk_window_set_title(GTK_WINDOW(mailer->fo_window), _("Mailer"));
+	gtk_window_set_title(GTK_WINDOW(mailer->fo_window), _(PACKAGE));
 #else
 	gtk_window_set_default_size(GTK_WINDOW(mailer->fo_window), 200, 300);
-	gtk_window_set_title(GTK_WINDOW(mailer->fo_window), _("Folders"));
+	gtk_window_set_title(GTK_WINDOW(mailer->fo_window),
+			_(PACKAGE " - Folders"));
 #endif
 #if GTK_CHECK_VERSION(2, 6, 0)
 	gtk_window_set_icon_name(GTK_WINDOW(mailer->fo_window), "mailer");
@@ -1567,7 +1568,11 @@ void mailer_show_preferences(Mailer * mailer, gboolean show)
 			GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+#ifndef EMBEDDED
 	gtk_window_set_default_size(GTK_WINDOW(mailer->pr_window), 400, 300);
+#else
+	gtk_window_set_default_size(GTK_WINDOW(mailer->pr_window), 200, 300);
+#endif
 	g_signal_connect_swapped(G_OBJECT(mailer->pr_window), "delete-event",
 			G_CALLBACK(_on_preferences_closex), mailer);
 	g_signal_connect(G_OBJECT(mailer->pr_window), "response",