X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=f13483f662491b636146918d6235b55aec904653;hp=08aec37db2829bd925ef4bfb1a1f77549e6e900f;hb=8125ec9d64e509b2238ff58a8cd905791f717c3e;hpb=e0c4bc41714769bff981d3d0a6bb2622b32c5b14

diff --git a/src/modest-init.c b/src/modest-init.c
index 08aec37..f13483f 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -319,7 +319,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type,
 
 	if ( col_num > 0 ) {
 		gint sort_col_id;
-		if (cols[i].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)
+		if (cols[0].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)
 			sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
 		else
 			sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
@@ -441,7 +441,8 @@ modest_init_local_folders (const gchar* location_filepath)
 		 */
 
 		gchar *dir = g_build_filename (maildir_path,
-				"Archive", NULL);			
+					       modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_ARCHIVE),
+					       NULL);
 		const gboolean created = modest_init_one_local_folder (dir);
 		g_free(dir);