X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-platform.c;h=030da3fb77663789617a53b1672f42dcf3f4d1bf;hp=f2661972da70aaebe8f7c1f35b37c4bb77f5479c;hb=e28799fccf1cbb59921171867fe0ed462c1225b5;hpb=bd6f842fd8084d2a0ca0afae7641d6dddf5e03f9

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index f266197..030da3f 100644
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -2474,8 +2474,16 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store)
 
 	account = TNY_ACCOUNT (folder_store);
 	if (modest_tny_account_is_virtual_local_folders (account)) {
+		gchar *device_name;
 		account_id = tny_account_get_id (account);
-		selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
+		device_name = modest_conf_get_string (modest_runtime_get_conf(),
+						      MODEST_CONF_DEVICE_NAME, NULL);
+		if (device_name) {
+			selection_label_text = g_strconcat (device_name, "/", NULL);
+			g_free (device_name);
+		} else {
+			selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);
+		}
 	} else if (modest_tny_account_is_memory_card_account (account)) {
 		account_id = tny_account_get_id (account);
 		selection_label_text = g_strconcat (tny_account_get_name (account), "/", NULL);