Fix bug #3107, " Height of row in message list does not
[claws.git] / src / summaryview.c
index 22497d8342db19f79d8aed7a5018178f6e09b23d..7e442c7f5253d71a7a7a384c1c98f43aff4f71f1 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,6 +81,7 @@
 #include "edittags.h"
 #include "manual.h"
 #include "manage_window.h"
+#include "avatars.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
@@ -1019,7 +1020,7 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        SummaryColumnState *col_state = summaryview->col_state;
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        
-       if (!item || (prefs_common.layout_mode == VERTICAL_LAYOUT && prefs_common.two_line_vert) )
+       if (!item || ((prefs_common.layout_mode == VERTICAL_LAYOUT || prefs_common.layout_mode == SMALL_LAYOUT) && prefs_common.two_line_vert) )
                return;
        if (FOLDER_SHOWS_TO_HDR(item))
                show_to = TRUE;
@@ -1211,7 +1212,7 @@ static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
        return TRUE;
 }
 
-static gboolean summaryview_quicksearch_root_progress(gpointer data, guint at, guint matched, guint total)
+gboolean summaryview_search_root_progress(gpointer data, guint at, guint matched, guint total)
 {
        SummaryView *summaryview = (SummaryView*) data;
 
@@ -1369,7 +1370,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
                folder_item_update_freeze();
 
-               quicksearch_set_on_progress_cb(summaryview->quicksearch, summaryview_quicksearch_root_progress, summaryview);
+               quicksearch_set_on_progress_cb(summaryview->quicksearch, summaryview_search_root_progress, summaryview);
                quicksearch_run_on_folder(summaryview->quicksearch, summaryview->folder_item, &mlist);
 
                folder_item_update_thaw();
@@ -1709,72 +1710,83 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
-       SensitiveCond state;
+       SensitiveCondMask state;
        gboolean sensitive;
        gint i;
 
-       static const struct {
-               gchar *const entry;
-               SensitiveCond cond;
-       } entry[] = {
-               {"Menus/SummaryViewPopup/Reply"                 , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+#define N_ENTRIES 38
+       static struct {
+               const gchar *entry;
+               SensitiveCondMask cond;
+       } entry[N_ENTRIES];
+
+       i = 0;
+#define FILL_TABLE(entry_str, ...) \
+do { \
+       entry[i].entry = (const gchar *) entry_str; entry[i++].cond = main_window_get_mask(__VA_ARGS__, -1); \
+} while (0)
+
+       FILL_TABLE("Menus/SummaryViewPopup/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST);
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/ReplyTo"                       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/ReplyTo/All"           , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/ReplyTo/Sender"             , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/ReplyTo/MailingList"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/ReplyTo/All", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/ReplyTo/Sender", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/ReplyTo/MailingList", M_HAVE_ACCOUNT, M_TARGET_EXIST);
 #endif
 
-               {"Menus/SummaryViewPopup/Forward"                       , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/Forward", M_HAVE_ACCOUNT, M_TARGET_EXIST);
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/ForwardAtt"    , M_HAVE_ACCOUNT|M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Redirect"                      , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/ForwardAtt", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Redirect", M_HAVE_ACCOUNT, M_TARGET_EXIST);
 #endif
 
-               {"Menus/SummaryViewPopup/Move"                  , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
-               {"Menus/SummaryViewPopup/Copy"                  , M_TARGET_EXIST|M_EXEC},
-               {"Menus/SummaryViewPopup/Trash"         , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS|M_NOT_TRASH},
+       FILL_TABLE("Menus/SummaryViewPopup/Move", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
+       FILL_TABLE("Menus/SummaryViewPopup/Copy", M_TARGET_EXIST, M_EXEC);
+       FILL_TABLE("Menus/SummaryViewPopup/Trash", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS, M_NOT_TRASH);
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/Delete"                        , M_TARGET_EXIST|M_ALLOW_DELETE},
+       FILL_TABLE("Menus/SummaryViewPopup/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
 #endif
 
-               {"Menus/SummaryViewPopup/Mark"                  , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/Mark"             , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/Unmark"                   , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/MarkUnread"       , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/MarkRead"         , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/MarkAllRead"      , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/IgnoreThread"     , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/UnignoreThread"           , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/WatchThread"              , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/UnwatchThread"    , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/Unlock"                   , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/Lock"             , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Mark/MarkSpam"         , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"Menus/SummaryViewPopup/Mark/MarkHam"          , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
-               {"Menus/SummaryViewPopup/ColorLabel"                    , M_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/Tags"                  , M_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/Mark", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/Mark", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/UnignoreThread", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/UnwatchThread", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/Lock", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+       FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+       FILL_TABLE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/Tags", M_TARGET_EXIST);
 
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/AddSenderToAB" , M_SINGLE_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/AddSenderToAB", M_SINGLE_TARGET_EXIST);
 #endif
-               {"Menus/SummaryViewPopup/CreateFilterRule"              , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+       FILL_TABLE("Menus/SummaryViewPopup/CreateFilterRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/CreateProcessingRule"  , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+       FILL_TABLE("Menus/SummaryViewPopup/CreateProcessingRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
 #endif
 
-               {"Menus/SummaryViewPopup/View"                  , M_SINGLE_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/View/OpenNewWindow"     , M_SINGLE_TARGET_EXIST},
-               {"Menus/SummaryViewPopup/View/MessageSource"            , M_SINGLE_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/View", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/View/OpenNewWindow", M_SINGLE_TARGET_EXIST);
+       FILL_TABLE("Menus/SummaryViewPopup/View/MessageSource", M_SINGLE_TARGET_EXIST);
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/View/AllHeaders"               , M_SINGLE_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/View/AllHeaders", M_SINGLE_TARGET_EXIST);
 #endif
-               {"Menus/SummaryViewPopup/SaveAs"                        , M_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/SaveAs", M_TARGET_EXIST);
 #ifndef GENERIC_UMPC
-               {"Menus/SummaryViewPopup/Print"                 , M_TARGET_EXIST},
+       FILL_TABLE("Menus/SummaryViewPopup/Print", M_TARGET_EXIST);
 #endif
-               {NULL, 0}
-       };
+       FILL_TABLE(NULL, -1);
+#undef FILL_TABLE
+       if (i != N_ENTRIES)
+               g_error("summaryview menu entry table size mismatch (%d/%d)", i, N_ENTRIES);
+#undef ENTRIES
 
        main_window_set_menu_sensitive(summaryview->mainwin);
 
@@ -2157,12 +2169,8 @@ void summary_select_by_msg_list(SummaryView      *summaryview, GSList *msginfos)
 
        ctree = GTK_CMCTREE(summaryview->ctree);
 
-       msgnum_list = NULL;
-       for(walk = msginfos; walk; walk = walk->next) {
-               MsgInfo *msginfo;
-               msginfo = walk->data;
-               msgnum_list = g_slist_prepend(msgnum_list, GUINT_TO_POINTER(msginfo->msgnum));
-       }
+       msgnum_list = procmsg_get_number_list_for_msgs(msginfos);
+
        START_LONG_OPERATION(summaryview, FALSE);
        for(walk = msgnum_list; walk; walk = walk->next) {
                GtkCMCTreeNode *node;
@@ -3043,7 +3051,8 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
        gint *col_pos = summaryview->col_pos;
        const gchar *msgid = msginfo->msgid;
        GHashTable *msgid_table = summaryview->msgid_table;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
 
        summary_set_header(summaryview, text, msginfo);
 
@@ -3069,7 +3078,7 @@ static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode
        if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
                SET_TEXT(S_COL_TAGS);
 
-       if (vert && prefs_common.two_line_vert)
+       if ((vert_layout || small_layout) && prefs_common.two_line_vert)
                g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
 #undef SET_TEXT
@@ -3092,8 +3101,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        GHashTable *msgid_table;
        GHashTable *subject_table = NULL;
        GSList * cur;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        START_TIMING("");
        
        if (!mlist) return;
@@ -3153,7 +3162,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                (ctree, NULL, node, text, 2,
                                 NULL, NULL,
                                 FALSE, FALSE);
-                       if (vert && prefs_common.two_line_vert)
+                       if ((vert_layout || small_layout) && prefs_common.two_line_vert)
                                g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
 
                        GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
@@ -3251,7 +3260,8 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        gint *col_pos = summaryview->col_pos;
        gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
        gboolean should_swap = FALSE;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        static const gchar *color_dim_rgb = NULL;
        if (!color_dim_rgb)
                color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
@@ -3295,7 +3305,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 
        /* slow! */
        if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || 
-           (vert && prefs_common.two_line_vert)) {
+           ((vert_layout || small_layout) && prefs_common.two_line_vert)) {
                if (msginfo->date_t && msginfo->date_t > 0) {
                        procheader_date_get_localtime(date_modified,
                                                      sizeof(date_modified),
@@ -3388,7 +3398,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 #endif
                text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
                        _("(No Subject)");
-       if (vert && prefs_common.two_line_vert) {
+       if ((vert_layout || small_layout) && prefs_common.two_line_vert) {
                if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) {
                        gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
                                        text[col_pos[S_COL_SUBJECT]],
@@ -3673,10 +3683,6 @@ void summary_view_source(SummaryView * summaryview)
        msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
        source_window_show_msg(srcwin, msginfo);
        source_window_show(srcwin);
-#ifdef MAEMO
-       maemo_window_full_screen_if_needed(GTK_WINDOW(srcwin->window));
-       maemo_connect_key_press_to_mainwindow(GTK_WINDOW(srcwin->window));
-#endif
 }
 
 void summary_reedit(SummaryView *summaryview)
@@ -4103,7 +4109,7 @@ void summary_mark_all_read(SummaryView *summaryview)
        if (prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
                        _("Do you really want to mark all mails in this "
-                         "folder as read ?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+                         "folder as read?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4363,6 +4369,8 @@ void summary_delete(SummaryView *summaryview)
        if (summary_is_locked(summaryview)) return;
 
        if (!summaryview->folder_item) return;
+       
+       START_LONG_OPERATION(summaryview, FALSE);
 
        if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
                if (!prefs_common.live_dangerously) {
@@ -4376,7 +4384,10 @@ void summary_delete(SummaryView *summaryview)
                                          buf,
                                          GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
                        g_free(buf);
-                       if (aval != G_ALERTALTERNATE) return;
+                       if (aval != G_ALERTALTERNATE) {
+                               END_LONG_OPERATION(summaryview);
+                               return;
+                       }
                }
        }
 
@@ -4393,7 +4404,6 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
-       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                sel_last = GTK_CMCTREE_NODE(cur->data);
@@ -4673,8 +4683,8 @@ void summary_add_address(SummaryView *summaryview)
 {
        MsgInfo *msginfo, *full_msginfo;
        gchar *from;
-       GtkWidget *image = NULL;
        GdkPixbuf *picture = NULL;
+       AvatarRender *avatarr;
 
        msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
@@ -4686,23 +4696,14 @@ void summary_add_address(SummaryView *summaryview)
        extract_address(from);
        
        full_msginfo = procmsg_msginfo_get_full_info(msginfo);
-       if (full_msginfo &&
-           full_msginfo->extradata &&
-           full_msginfo->extradata->face) {
-               image = face_get_from_header(full_msginfo->extradata->face);
-       } 
-#if HAVE_LIBCOMPFACE
-       else if (full_msginfo &&
-                full_msginfo->extradata &&
-                full_msginfo->extradata->xface) {
-               image = xface_get_from_header(full_msginfo->extradata->xface,
-                               &summaryview->ctree->style->white,
-                               summaryview->mainwin->window->window);  
-       }
-#endif
+
+       avatarr = avatars_avatarrender_new(full_msginfo);
+       hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
+
        procmsg_msginfo_free(full_msginfo);
-       if (image)
-               picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
+
+       if (avatarr->image)
+               picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
 
 #ifndef USE_NEW_ADDRBOOK
        addressbook_add_contact(msginfo->fromname, from, NULL, picture);
@@ -4711,8 +4712,7 @@ void summary_add_address(SummaryView *summaryview)
                debug_print( "addressbook_add_contact - added\n" );
        }
 #endif
-       if (image)
-               gtk_widget_destroy(image);
+       avatars_avatarrender_free(avatarr);
 }
 
 void summary_select_all(SummaryView *summaryview)
@@ -6005,7 +6005,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
        accel_path = g_strdup_printf("<ClawsColorLabels>/None");
        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
        g_free(accel_path);
-       gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
+       gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
 
        item = gtk_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -6025,7 +6025,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
                accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
                gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
                if (i < 9)
-                       gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
+                       gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
                g_free(accel_path);
                g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager), 
                        "accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
@@ -6334,8 +6334,8 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        gchar *formatted = NULL;
        MsgInfo *info = NULL;
        GdkRectangle rect;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        if (!prefs_common.show_tooltips)
                return FALSE;
 
@@ -6373,10 +6373,10 @@ static gboolean tooltip_cb (GtkWidget  *widget,
        formatted = g_strdup(text);
        g_strstrip(formatted);
 
-       if (!vert)      
-               gtk_tooltip_set_text (tooltip, formatted);
-       else if (prefs_common.two_line_vert)
+       if ((vert_layout || small_layout) && prefs_common.two_line_vert)
                gtk_tooltip_set_markup (tooltip, formatted);
+       else 
+                       gtk_tooltip_set_text (tooltip, formatted);
        g_free(formatted);
        
        rect.x = x - 2;
@@ -6396,8 +6396,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gchar *titles[N_SUMMARY_COLS];
        SummaryColumnType type;
        gint pos;
-       gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+       gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+       gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
        memset(titles, 0, sizeof(titles));
 
        col_state = prefs_summary_column_get_config();
@@ -6412,14 +6412,10 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        ctree = gtk_sctree_new_with_titles
                (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
-       /* get normal row height */
-       gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
-       normal_row_height = GTK_CMCLIST(ctree)->row_height;
-
        if (prefs_common.show_col_headers == FALSE)
                gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
 
-       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_EXTENDED);
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
        gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
        gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_STATUS],
@@ -6473,7 +6469,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                       FALSE);
                if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
                     (pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
-                    pos == summaryview->col_pos[S_COL_DATE]) && vert &&
+                    pos == summaryview->col_pos[S_COL_DATE]) && (vert_layout || small_layout) &&
                            prefs_common.two_line_vert)
                        gtk_cmclist_set_column_visibility
                                (GTK_CMCLIST(ctree), pos, FALSE);
@@ -6482,7 +6478,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                (GTK_CMCLIST(ctree), pos, col_state[pos].visible);
        }
        if (prefs_common.two_line_vert)
-               gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
+               gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert_layout||small_layout);
 
        /* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
@@ -6514,15 +6510,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        g_signal_connect(G_OBJECT(ctree), "button_press_event",
                         G_CALLBACK(summary_button_pressed),
                         summaryview);
-#ifndef MAEMO
        g_signal_connect(G_OBJECT(ctree), "popup-menu",
                         G_CALLBACK(summary_popup_menu), summaryview);
-#else
-       gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
-                       GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
-       g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
-                        G_CALLBACK(summary_popup_menu), summaryview);
-#endif
        g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(summary_button_released),
                         summaryview);
@@ -6605,11 +6594,13 @@ void summary_set_column_order(SummaryView *summaryview)
        else
                summary_redisplay_msg(summaryview);
 
-       if (prefs_common.layout_mode == VERTICAL_LAYOUT &&
+       /* get normal row height */
+       gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+       normal_row_height = GTK_CMCLIST(ctree)->row_height;             
+               
+       if ((prefs_common.layout_mode == SMALL_LAYOUT || prefs_common.layout_mode == VERTICAL_LAYOUT) &&
            prefs_common.two_line_vert) {
                gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);           
-       } else {
-               gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);         
        }
 }