2007-12-06 [colin] 3.1.0cvs62
[claws.git] / src / addressbook.c
index cdaf2002ad8e7359f2b86fa0d376e7a2036b11a6..43fedc7c81281e4577312cc96e82e1e84622fe23 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -44,6 +44,8 @@
 #include <gtk/gtkitemfactory.h>
 #include <string.h>
 #include <setjmp.h>
+#include <sys/types.h>
+#include <dirent.h>
 
 #include "main.h"
 #include "addressbook.h"
@@ -69,6 +71,8 @@
 #include "addrbook.h"
 #include "addrindex.h"
 #include "addressadd.h"
+#include "addrduplicates.h"
+#include "addressbook_foldersel.h"
 #include "vcard.h"
 #include "editvcard.h"
 #include "editgroup.h"
@@ -77,6 +81,7 @@
 #include "importldif.h"
 #include "importmutt.h"
 #include "importpine.h"
+#include "manual.h"
 
 #ifdef USE_JPILOT
 #include "jpilot.h"
@@ -87,6 +92,7 @@
 #include <pthread.h>
 #include "ldapserver.h"
 #include "editldap.h"
+#include "ldapupdate.h"
 
 #define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
 #endif
 #include "exphtmldlg.h"
 #include "expldifdlg.h"
 #include "browseldap.h"
+#include "addrcustomattr.h"
 
 typedef enum
 {
@@ -114,6 +121,23 @@ typedef enum
        N_LIST_COLS     = 3
 } AddressListColumns;
 
+typedef struct {
+       AddressBookFile *book;
+       ItemFolder      *folder;
+} FolderInfo;
+
+typedef struct {
+       gchar **folder_path;
+       gboolean matched;
+       gint index;
+       AddressDataSource *book;
+       ItemFolder *folder;
+} FolderPathMatch;
+
+static gchar *list_titles[] = { N_("Name"),
+                                N_("Email Address"),
+                                N_("Remarks") };
+
 #define COL_NAME_WIDTH         164
 #define COL_ADDRESS_WIDTH      156
 
@@ -164,10 +188,17 @@ static AddressBook_win addrbook;
 static GHashTable *_addressBookTypeHash_ = NULL;
 static GList *_addressBookTypeList_ = NULL;
 
+static void addressbook_new_address_from_book_post_cb( ItemPerson *person );
+static void addressbook_new_address_from_folder_post_cb( ItemPerson *person );
+static void addressbook_edit_address_post_cb( ItemPerson *person );
+
 static void addressbook_create                 (void);
 static gint addressbook_close                  (void);
 static void addressbook_button_set_sensitive   (void);
 
+static gboolean address_index_has_focus = FALSE;
+static gboolean address_list_has_focus = FALSE;
+
 /* callback functions */
 static void addressbook_del_clicked            (GtkButton      *button,
                                                 gpointer        data);
@@ -203,10 +234,6 @@ static void addressbook_person_collapse_node       (GtkCTree       *ctree,
                                                 GList          *node,
                                                 gpointer       *data );
 
-#if 0
-static void addressbook_entry_changed          (GtkWidget      *widget);
-#endif
-
 static gboolean addressbook_list_button_pressed        (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
@@ -308,9 +335,6 @@ static gboolean addressbook_entry_key_pressed       (GtkWidget      *widget,
 static gint addressbook_treenode_compare_func  (GtkCList       *clist,
                                                 gconstpointer   ptr1,
                                                 gconstpointer   ptr2);
-static gint addressbook_list_compare_func      (GtkCList       *clist,
-                                                gconstpointer   ptr1,
-                                                gconstpointer   ptr2);
 static void addressbook_folder_load_one_person (GtkCTree *clist, 
                                                 ItemPerson *person,  
                                                 AddressTypeControlItem *atci, 
@@ -322,15 +346,18 @@ static void addressbook_folder_remove_one_person(GtkCTree *clist,
 static void addressbook_folder_remove_node     (GtkCTree *clist, 
                                                 GtkCTreeNode *node);
 
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+                                                                         gboolean force_focus );
+
 /* LUT's and IF stuff */
 static void addressbook_free_treenode          ( gpointer data );
-AddressTypeControlItem *addrbookctl_lookup     (gint            ot);
-AddressTypeControlItem *addrbookctl_lookup_iface(AddressIfType  ifType);
+static AddressTypeControlItem *addrbookctl_lookup      (gint            ot);
+static AddressTypeControlItem *addrbookctl_lookup_iface(AddressIfType   ifType);
 
-void addrbookctl_build_map                     (GtkWidget      *window);
-void addrbookctl_build_iflist                  (void);
-AdapterInterface *addrbookctl_find_interface   (AddressIfType   ifType);
-void addrbookctl_build_ifselect                        (void);
+static void addrbookctl_build_map                      (GtkWidget      *window);
+static void addrbookctl_build_iflist                   (void);
+static AdapterInterface *addrbookctl_find_interface    (AddressIfType   ifType);
+static void addrbookctl_build_ifselect                 (void);
 
 static void addrbookctl_free_interface         (AdapterInterface *adapter);
 static void addrbookctl_free_datasource                (AdapterDSource   *adapter);
@@ -343,6 +370,8 @@ static void addressbook_list_select_add             ( AddrItemObject    *aio,
 static void addressbook_list_select_remove     ( AddrItemObject    *aio );
 
 static void addressbook_import_ldif_cb         ( void );
+static void addressbook_find_duplicates_cb     ( void );
+static void addressbook_edit_custom_attr_cb    ( void );
 static void addressbook_import_mutt_cb         ( void );
 static void addressbook_import_pine_cb         ( void );
 static void addressbook_export_html_cb         ( void );
@@ -393,7 +422,7 @@ static void addressbook_list_menu_setup( void );
 
 static GtkTargetEntry addressbook_drag_types[] =
 {
-       {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
 };
 
 static GtkTargetList *addressbook_target_list = NULL;
@@ -401,77 +430,82 @@ static GtkTargetList *addressbook_target_list = NULL;
 
 static GtkItemFactoryEntry addressbook_entries[] =
 {
-       {N_("/_Book"),                  NULL,           NULL, 0, "<Branch>"},
-       {N_("/_Book/New _Book"),        "<control>B",   addressbook_new_book_cb,        0, NULL},
-       {N_("/_Book/New _Folder"),      "<control>R",   addressbook_new_folder_cb,      0, NULL},
-       {N_("/_Book/New _vCard"),       "<control><shift>D",    addressbook_new_vcard_cb,       0, NULL},
+       {N_("/_Book"),                  NULL,           NULL, 0, "<Branch>", NULL},
+       {N_("/_Book/New _Book"),        "<control>B",   addressbook_new_book_cb,        0, NULL, NULL},
+       {N_("/_Book/New _Folder"),      "<control>R",   addressbook_new_folder_cb,      0, NULL, NULL},
+       {N_("/_Book/New _vCard"),       "<control><shift>D",    addressbook_new_vcard_cb,       0, NULL, NULL},
 #ifdef USE_JPILOT
-       {N_("/_Book/New _JPilot"),      "<control>J",   addressbook_new_jpilot_cb,      0, NULL},
+       {N_("/_Book/New _JPilot"),      "<control>J",   addressbook_new_jpilot_cb,      0, NULL, NULL},
 #endif
 #ifdef USE_LDAP
-       {N_("/_Book/New LDAP _Server"), "<control><shift>S",    addressbook_new_ldap_cb,        0, NULL},
+       {N_("/_Book/New LDAP _Server"), "<control><shift>S",    addressbook_new_ldap_cb,        0, NULL, NULL},
 #endif
-       {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Book/_Edit book"),       NULL,           addressbook_treenode_edit_cb,   0, NULL},
-       {N_("/_Book/_Delete book"),     NULL,           addressbook_treenode_delete_cb, 0, NULL},
-       {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Book/_Save"),            "<control>S",   addressbook_file_save_cb,       0, NULL},
-       {N_("/_Book/_Close"),           "<control>W",   close_cb,                       0, NULL},
-       {N_("/_Address"),                       NULL,           NULL, 0, "<Branch>"},
-       {N_("/_Address/_Select all"),   "<control>A",   addressbook_select_all_cb,      0, NULL},
-       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Address/C_ut"),          "<control>X",   addressbook_clip_cut_cb,        0, NULL},
-       {N_("/_Address/_Copy"),         "<control>C",   addressbook_clip_copy_cb,       0, NULL},
-       {N_("/_Address/_Paste"),        "<control>V",   addressbook_clip_paste_cb,      0, NULL},
-       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Address/_Edit"),         "<control>Return",addressbook_edit_address_cb,    0, NULL},
-       {N_("/_Address/_Delete"),       "<control>D",   addressbook_delete_address_cb,  0, NULL},
-       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Address/New _Address"),  "<control>N",   addressbook_new_address_cb,     0, NULL},
-       {N_("/_Address/New _Group"),    "<control>G",   addressbook_new_group_cb,       0, NULL},
-       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Address/_Mail To"),      NULL,           addressbook_mail_to_cb,         0, NULL},
-       {N_("/_Tools"),                 NULL,           NULL, 0, "<Branch>"},
-       {N_("/_Tools/Import _LDIF file..."), NULL,      addressbook_import_ldif_cb,     0, NULL},
-       {N_("/_Tools/Import M_utt file..."), NULL,      addressbook_import_mutt_cb,     0, NULL},
-       {N_("/_Tools/Import _Pine file..."), NULL,      addressbook_import_pine_cb,     0, NULL},
-       {N_("/_Tools/---"),             NULL,           NULL, 0, "<Separator>"},
-       {N_("/_Tools/Export _HTML..."), NULL,           addressbook_export_html_cb,     0, NULL},
-       {N_("/_Tools/Export LDI_F..."), NULL,           addressbook_export_ldif_cb,     0, NULL},
-       {N_("/_Help"),                  NULL,           NULL, 0, "<Branch>"},
-       {N_("/_Help/_About"),           NULL,           about_show, 0, NULL}
+       {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Book/_Edit book"),       NULL,           addressbook_treenode_edit_cb,   0, NULL, NULL},
+       {N_("/_Book/_Delete book"),     NULL,           addressbook_treenode_delete_cb, 0, NULL, NULL},
+       {N_("/_Book/---"),              NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Book/_Save"),            "<control>S",   addressbook_file_save_cb,       0, NULL, NULL},
+       {N_("/_Book/_Close"),           "<control>W",   close_cb,                       0, NULL, NULL},
+       {N_("/_Address"),                       NULL,           NULL, 0, "<Branch>", NULL},
+       {N_("/_Address/_Select all"),   "<control>A",   addressbook_select_all_cb,      0, NULL, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Address/C_ut"),          "<control>X",   addressbook_clip_cut_cb,        0, NULL, NULL},
+       {N_("/_Address/_Copy"),         "<control>C",   addressbook_clip_copy_cb,       0, NULL, NULL},
+       {N_("/_Address/_Paste"),        "<control>V",   addressbook_clip_paste_cb,      0, NULL, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Address/_Edit"),         "<control>Return",addressbook_edit_address_cb,    0, NULL, NULL},
+       {N_("/_Address/_Delete"),       "<control>D",   addressbook_delete_address_cb,  0, NULL, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Address/New _Address"),  "<control>N",   addressbook_new_address_cb,     0, NULL, NULL},
+       {N_("/_Address/New _Group"),    "<control>G",   addressbook_new_group_cb,       0, NULL, NULL},
+       {N_("/_Address/---"),           NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Address/_Mail To"),      NULL,           addressbook_mail_to_cb,         0, NULL, NULL},
+       {N_("/_Tools"),                 NULL,           NULL, 0, "<Branch>", NULL},
+       {N_("/_Tools/Import _LDIF file..."), NULL,      addressbook_import_ldif_cb,     0, NULL, NULL},
+       {N_("/_Tools/Import M_utt file..."), NULL,      addressbook_import_mutt_cb,     0, NULL, NULL},
+       {N_("/_Tools/Import _Pine file..."), NULL,      addressbook_import_pine_cb,     0, NULL, NULL},
+       {N_("/_Tools/---"),             NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Tools/Export _HTML..."), NULL,           addressbook_export_html_cb,     0, NULL, NULL},
+       {N_("/_Tools/Export LDI_F..."), NULL,           addressbook_export_ldif_cb,     0, NULL, NULL},
+       {N_("/_Tools/---"),             NULL,           NULL, 0, "<Separator>", NULL},
+       {N_("/_Tools/Find duplicates..."), NULL, addressbook_find_duplicates_cb,        0, NULL, NULL},
+       {N_("/_Tools/Edit custom attributes..."), NULL, addressbook_edit_custom_attr_cb,        0, NULL, NULL},
+       {N_("/_Help"),                  NULL,           NULL, 0, "<Branch>", NULL},
+       {N_("/_Help/_About"),           NULL,           about_show, 0, NULL, NULL}
 };
 
 static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
 {
-       {N_("/_Edit"),          NULL, addressbook_treenode_edit_cb,   0, NULL},
-       {N_("/_Delete"),        NULL, addressbook_treenode_delete_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,      0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/C_ut"),           NULL, addressbook_treenode_cut_cb,    0, NULL},
-       {N_("/_Copy"),          NULL, addressbook_treenode_copy_cb,   0, NULL},
-       {N_("/_Paste"),         NULL, addressbook_treenode_paste_cb,  0, NULL}
+       {N_("/_Edit"),          NULL, addressbook_treenode_edit_cb,   0, NULL, NULL},
+       {N_("/_Delete"),        NULL, addressbook_treenode_delete_cb, 0, NULL, NULL},
+       {"/---",                NULL, NULL, 0, "<Separator>", NULL},
+       {N_("/New _Book"),      NULL, addressbook_new_book_cb,      0, NULL, NULL},
+       {N_("/New _Folder"),    NULL, addressbook_new_folder_cb,      0, NULL, NULL},
+       {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL, NULL},
+       {"/---",                NULL, NULL, 0, "<Separator>", NULL},
+       {N_("/C_ut"),           NULL, addressbook_treenode_cut_cb,    0, NULL, NULL},
+       {N_("/_Copy"),          NULL, addressbook_treenode_copy_cb,   0, NULL, NULL},
+       {N_("/_Paste"),         NULL, addressbook_treenode_paste_cb,  0, NULL, NULL}
 };
 
 static GtkItemFactoryEntry addressbook_list_popup_entries[] =
 {
-       {N_("/_Select all"),    NULL, addressbook_select_all_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit"),          NULL, addressbook_edit_address_cb,   0, NULL},
-       {N_("/_Delete"),        NULL, addressbook_delete_address_cb, 0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/New _Address"),   NULL, addressbook_new_address_cb,    0, NULL},
-       {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-       {N_("/C_ut"),           NULL, addressbook_clip_cut_cb,       0, NULL},
-       {N_("/_Copy"),          NULL, addressbook_clip_copy_cb,      0, NULL},
-       {N_("/_Paste"),         NULL, addressbook_clip_paste_cb,     0, NULL},
-       {N_("/---"),            NULL, NULL, 0, "<Separator>"},
-/*     {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
-       {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL},
+       {N_("/_Select all"),    NULL, addressbook_select_all_cb, 0, NULL, NULL},
+       {"/---",                NULL, NULL, 0, "<Separator>", NULL},
+       {N_("/_Edit"),          NULL, addressbook_edit_address_cb,   0, NULL, NULL},
+       {N_("/_Delete"),        NULL, addressbook_delete_address_cb, 0, NULL, NULL},
+       {"/---",                NULL, NULL, 0, "<Separator>", NULL},
+       {N_("/New _Address"),   NULL, addressbook_new_address_cb,    0, NULL, NULL},
+       {N_("/New _Group"),     NULL, addressbook_new_group_cb,      0, NULL, NULL},
+       {"/---",                NULL, NULL, 0, "<Separator>", NULL},
+       {N_("/C_ut"),           NULL, addressbook_clip_cut_cb,       0, NULL, NULL},
+       {N_("/_Copy"),          NULL, addressbook_clip_copy_cb,      0, NULL, NULL},
+       {N_("/_Paste"),         NULL, addressbook_clip_paste_cb,     0, NULL, NULL},
+       {"/---",                NULL, NULL, 0, "<Separator>", NULL},
+/*     {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL, NULL},*/
+       {N_("/_Mail To"),       NULL, addressbook_mail_to_cb,            0, NULL, NULL},
 #ifdef USE_LDAP
-       {N_("/_Browse Entry"),  NULL, addressbook_browse_entry_cb,       0, NULL},
+       {N_("/_Browse Entry"),  NULL, addressbook_browse_entry_cb,       0, NULL, NULL},
 #endif 
 };
 
@@ -510,17 +544,21 @@ static ErrMsgTableEntry _lutErrorsGeneral_[] = {
  * Lookup table of error messages for LDAP errors.
  */
 static ErrMsgTableEntry _lutErrorsLDAP_[] = {
-       { LDAPRC_SUCCESS,       N_("Success") },
-       { LDAPRC_CONNECT,       N_("Error connecting to LDAP server") },
-       { LDAPRC_INIT,          N_("Error initializing LDAP") },
-       { LDAPRC_BIND,          N_("Error binding to LDAP server") },
-       { LDAPRC_SEARCH,        N_("Error searching LDAP database") },
-       { LDAPRC_TIMEOUT,       N_("Timeout performing LDAP operation") },
-       { LDAPRC_CRITERIA,      N_("Error in LDAP search criteria") },
-       { LDAPRC_NOENTRIES,     N_("No LDAP entries found for search criteria") },
-       { LDAPRC_STOP_FLAG,     N_("LDAP search terminated on request") },
-       { LDAPRC_TLS,           N_("Error starting TLS connection") },
-       { 0,                    NULL }
+       { LDAPRC_SUCCESS,                       N_("Success") },
+       { LDAPRC_CONNECT,                       N_("Error connecting to LDAP server") },
+       { LDAPRC_INIT,                          N_("Error initializing LDAP") },
+       { LDAPRC_BIND,                          N_("Error binding to LDAP server") },
+       { LDAPRC_SEARCH,                        N_("Error searching LDAP database") },
+       { LDAPRC_TIMEOUT,                       N_("Timeout performing LDAP operation") },
+       { LDAPRC_CRITERIA,                      N_("Error in LDAP search criteria") },
+       { LDAPRC_NOENTRIES,                     N_("No LDAP entries found for search criteria") },
+       { LDAPRC_STOP_FLAG,                     N_("LDAP search terminated on request") },
+       { LDAPRC_TLS,                           N_("Error starting TLS connection") },
+       { LDAPRC_NODN,                          N_("Distinguished Name (dn) is missing") },
+       { LDAPRC_NAMING_VIOLATION,              N_("Missing required information") },
+       { LDAPRC_ALREADY_EXIST,                 N_("Another contact exists with that key") },
+       { LDAPRC_STRONG_AUTH,                   N_("Strong(er) authentication required") },
+       { 0,                                    NULL }
 };
 #endif
 
@@ -551,7 +589,7 @@ static gchar *addressbook_err2string( ErrMsgTableEntry lut[], gint code ) {
 
 static gboolean lastCanLookup = FALSE;
 
-void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
+static void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
 {
        if (add_and_delete) {
                gtk_widget_show(addrbook.edit_btn);
@@ -610,6 +648,15 @@ void addressbook_open(Compose *target)
        }
 
        gtk_widget_show_all(addrbook.window);
+#ifdef MAEMO
+               maemo_window_full_screen_if_needed(GTK_WINDOW(addrbook.window));
+               maemo_connect_key_press_to_mainwindow(GTK_WINDOW(addrbook.window));
+#endif
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_widgetset_hide();
+
+       address_completion_start(addrbook.window);
+
        addressbook_show_buttons(target == NULL, lastCanLookup, target != NULL);
        addressbook_set_target_compose(target);
 }
@@ -668,8 +715,11 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
 {
        if (event && event->keyval == GDK_Escape)
                addressbook_close();
-       else if (event && event->keyval == GDK_Delete)
-               addressbook_del_clicked(NULL, NULL);
+       else if (event && event->keyval == GDK_Delete) {
+               /* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
+               if ( /* address_index_has_focus || */ address_list_has_focus )
+                       addressbook_del_clicked(NULL, NULL);
+       }
        return FALSE;
 }
 
@@ -685,6 +735,142 @@ static void addressbook_size_allocate_cb(GtkWidget *widget,
        prefs_common.addressbookwin_height = allocation->height;
 }
 
+static gint sort_column_number = 0;
+static GtkSortType sort_column_type = GTK_SORT_ASCENDING;
+
+static gint list_case_sort(
+       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+{
+       GtkCListRow *row1 = (GtkCListRow *) ptr1;
+       GtkCListRow *row2 = (GtkCListRow *) ptr2;
+       gchar *name1 = NULL, *name2 = NULL;
+       AddrItemObject *aio1 = ((GtkCListRow *)ptr1)->data;
+       AddrItemObject *aio2 = ((GtkCListRow *)ptr2)->data;
+
+       if( aio1->type == aio2->type ) {
+               if( row1 ) 
+                       name1 = GTK_CELL_TEXT (row1->cell[sort_column_number])->text;
+               if( row2 ) 
+                       name2 = GTK_CELL_TEXT (row2->cell[sort_column_number])->text;
+               if( ! name1 ) return ( name2 != NULL );
+               if( ! name2 ) return -1;
+               return g_utf8_collate( name1, name2 );
+       } else {
+               /* Order groups before person */
+               if( aio1->type == ITEMTYPE_GROUP ) {
+                       return (sort_column_type==GTK_SORT_ASCENDING) ? -1:+1;
+               } else if( aio2->type == ITEMTYPE_GROUP ) {
+                       return (sort_column_type==GTK_SORT_ASCENDING) ? +1:-1;
+               }
+               return 0;
+       }
+}
+
+static void addressbook_sort_list(GtkCList *clist, const gint col,
+               const GtkSortType sort_type)
+{
+       gint pos;
+       GtkWidget *hbox, *label, *arrow;
+
+       sort_column_number = col;
+       sort_column_type = sort_type;
+       gtk_clist_set_compare_func(clist, list_case_sort);
+       gtk_clist_set_sort_type(clist, sort_type);
+       gtk_clist_set_sort_column(clist, col);  
+
+       gtk_clist_freeze(clist);
+       gtk_clist_sort(clist);
+       
+       for(pos = 0 ; pos < N_LIST_COLS ; pos++) {
+               hbox = gtk_hbox_new(FALSE, 4);
+               label = gtk_label_new(gettext(list_titles[pos]));
+               gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+               
+               if(pos == col) {
+                       arrow = gtk_arrow_new(sort_type == GTK_SORT_ASCENDING ?
+                               GTK_ARROW_DOWN : GTK_ARROW_UP, GTK_SHADOW_IN);
+                       gtk_box_pack_end(GTK_BOX(hbox), arrow, FALSE, FALSE, 0);
+               }
+               
+               gtk_widget_show_all(hbox);
+               gtk_clist_set_column_widget(clist, pos, hbox);
+       }
+       
+       gtk_clist_thaw(clist);  
+}
+
+static void addressbook_name_clicked(GtkWidget *button, GtkCList *clist)
+{
+       static GtkSortType sort_type = GTK_SORT_ASCENDING;
+       
+       sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING :
+                       GTK_SORT_ASCENDING;
+       addressbook_sort_list(clist, COL_NAME, sort_type);
+}
+
+static void addressbook_address_clicked(GtkWidget *button, GtkCList *clist)
+{
+       static GtkSortType sort_type = GTK_SORT_ASCENDING;
+
+       sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING :
+                       GTK_SORT_ASCENDING;
+       addressbook_sort_list(clist, COL_ADDRESS, sort_type);
+}
+
+static void addressbook_remarks_clicked(GtkWidget *button, GtkCList *clist)
+{
+       static GtkSortType sort_type = GTK_SORT_ASCENDING;
+
+       sort_type = (sort_type == GTK_SORT_ASCENDING) ? GTK_SORT_DESCENDING :
+                       GTK_SORT_ASCENDING;
+       addressbook_sort_list(clist, COL_REMARKS, sort_type);
+}
+
+static gboolean addressbook_address_index_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_index_has_focus = TRUE;
+       return FALSE;
+}
+
+static gboolean addressbook_address_index_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_index_has_focus = FALSE;
+       if (!prefs_common.addressbook_use_editaddress_dialog
+                       && !address_list_has_focus)
+               addressbook_address_list_disable_some_actions();
+       return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_list_has_focus = TRUE;
+       return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+                                                                                        gpointer data)
+{
+       address_list_has_focus = FALSE;
+       if (!prefs_common.addressbook_use_editaddress_dialog
+                       && !address_index_has_focus)
+               addressbook_address_list_disable_some_actions();
+       return FALSE;
+}
+
+/* save hpane and vpane's handle position when it moves */
+static void addressbook_pane_save_position(void)
+{
+       if (addrbook.hpaned)
+               prefs_common.addressbook_hpaned_pos = 
+                       gtk_paned_get_position(GTK_PANED(addrbook.hpaned));
+       if (addrbook.vpaned)
+               prefs_common.addressbook_vpaned_pos = 
+                       gtk_paned_get_position(GTK_PANED(addrbook.vpaned));
+}
+
 /*
 * Create the address book widgets. The address book contains two CTree widgets: the
 * address index tree on the left and the address list on the right.
@@ -708,16 +894,19 @@ static void addressbook_create(void)
        GtkWidget *vbox2;
        GtkWidget *ctree_swin;
        GtkWidget *ctree;
+       GtkWidget *editaddress_vbox;
        GtkWidget *clist_vbox;
        GtkWidget *clist_swin;
        GtkWidget *clist;
-       GtkWidget *paned;
+       GtkWidget *hpaned;
+       GtkWidget *vpaned;
        GtkWidget *hbox;
        GtkWidget *label;
        GtkWidget *entry;
        GtkWidget *statusbar;
        GtkWidget *hbbox;
        GtkWidget *hsbox;
+       GtkWidget *help_btn;
        GtkWidget *del_btn;
        GtkWidget *edit_btn;
        GtkWidget *reg_btn;
@@ -735,7 +924,6 @@ static void addressbook_create(void)
        GList *nodeIf;
 
        gchar *index_titles[N_INDEX_COLS];
-       gchar *list_titles[N_LIST_COLS];
        gchar *text;
        gint i;
 
@@ -744,12 +932,9 @@ static void addressbook_create(void)
        debug_print("Creating addressbook window...\n");
 
        index_titles[COL_SOURCES] = _("Sources");
-       list_titles[COL_NAME]    = _("Name");
-       list_titles[COL_ADDRESS] = _("E-Mail address");
-       list_titles[COL_REMARKS] = _("Remarks");
 
        /* Address book window */
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addressbook");
        gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_widget_realize(window);
@@ -781,7 +966,7 @@ static void addressbook_create(void)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-       gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
+       gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 20, -1);
 
        /* Address index */
        ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
@@ -819,6 +1004,10 @@ static void addressbook_create(void)
        g_signal_connect(G_OBJECT(ctree), "drag_data_received",
                         G_CALLBACK(addressbook_drag_received_cb),
                         ctree);
+       g_signal_connect(G_OBJECT(ctree), "focus_in_event",
+               G_CALLBACK(addressbook_address_index_focus_evt_in), NULL);
+       g_signal_connect(G_OBJECT(ctree), "focus_out_event",
+               G_CALLBACK(addressbook_address_index_focus_evt_out), NULL);
 
        clist_vbox = gtk_vbox_new(FALSE, 4);
 
@@ -839,8 +1028,19 @@ static void addressbook_create(void)
                                   COL_NAME_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(clist), COL_ADDRESS,
                                   COL_ADDRESS_WIDTH);
-       gtk_clist_set_compare_func(GTK_CLIST(clist),
-                                  addressbook_list_compare_func);
+       gtk_widget_set_size_request(clist, -1, 80);
+
+       addressbook_sort_list(GTK_CLIST(clist), COL_NAME, GTK_SORT_ASCENDING);
+       g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_NAME].button),
+               "clicked", G_CALLBACK(addressbook_name_clicked), clist);
+       g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_ADDRESS].button),
+               "clicked", G_CALLBACK(addressbook_address_clicked), clist);
+       g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_REMARKS].button),
+               "clicked", G_CALLBACK(addressbook_remarks_clicked), clist);
+       g_signal_connect(G_OBJECT(clist), "focus_in_event",
+               G_CALLBACK(addressbook_address_list_focus_evt_in), NULL);
+       g_signal_connect(G_OBJECT(clist), "focus_out_event",
+               G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
 
        for (i = 0; i < N_LIST_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
@@ -873,20 +1073,28 @@ static void addressbook_create(void)
        entry = gtk_entry_new();
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
-       address_completion_register_entry(GTK_ENTRY(entry));
+       address_completion_register_entry(GTK_ENTRY(entry), FALSE);
 
        g_signal_connect(G_OBJECT(entry), "key_press_event",
                         G_CALLBACK(addressbook_entry_key_pressed),
                         NULL);
-#if 0
-       g_signal_connect(G_OBJECT(entry), "changed",
-                        G_CALLBACK(addressbook_entry_changed), NULL);
-#endif
 
-       paned = gtk_hpaned_new();
-       gtk_box_pack_start(GTK_BOX(vbox2), paned, TRUE, TRUE, 0);
-       gtk_paned_add1(GTK_PANED(paned), ctree_swin);
-       gtk_paned_add2(GTK_PANED(paned), clist_vbox);
+       if (!prefs_common.addressbook_use_editaddress_dialog) {
+               editaddress_vbox = gtk_vbox_new(FALSE, 4);
+               vpaned = gtk_vpaned_new();
+               gtk_paned_pack1(GTK_PANED(vpaned), clist_vbox, FALSE, FALSE);
+               gtk_paned_pack2(GTK_PANED(vpaned), editaddress_vbox, TRUE, FALSE);
+       } else {
+               vpaned = NULL;
+               editaddress_vbox = NULL;
+       }
+       hpaned = gtk_hpaned_new();
+       gtk_box_pack_start(GTK_BOX(vbox2), hpaned, TRUE, TRUE, 0);
+       gtk_paned_pack1(GTK_PANED(hpaned), ctree_swin, FALSE, FALSE);
+       if (prefs_common.addressbook_use_editaddress_dialog)
+               gtk_paned_pack2(GTK_PANED(hpaned), clist_vbox, TRUE, FALSE);
+       else
+               gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
 
        /* Status bar */
        hsbox = gtk_hbox_new(FALSE, 0);
@@ -897,15 +1105,13 @@ static void addressbook_create(void)
        /* Button panel */
        hbbox = gtk_hbutton_box_new();
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
-       gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
+       gtk_box_set_spacing(GTK_BOX(hbbox), 2);
        gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION(2, 6, 0)
+       gtkut_stock_button_add_help(hbbox, &help_btn);
+
        edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
-#else
-       edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
-#endif
        GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
@@ -920,6 +1126,10 @@ static void addressbook_create(void)
        GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
 
+       g_signal_connect(G_OBJECT(help_btn), "clicked",
+                        G_CALLBACK(manual_open_with_anchor_cb),
+                        MANUAL_ANCHOR_ADDRBOOK);
+
        g_signal_connect(G_OBJECT(edit_btn), "clicked",
                         G_CALLBACK(addressbook_edit_clicked), NULL);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
@@ -930,15 +1140,15 @@ static void addressbook_create(void)
                         G_CALLBACK(addressbook_lup_clicked), NULL);
 
        to_btn = gtk_button_new_with_label
-               (prefs_common.trans_hdr ? _("To:") : "To:");
+               (prefs_common_translated_header_name("To:"));
        GTK_WIDGET_SET_FLAGS(to_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), to_btn, TRUE, TRUE, 0);
        cc_btn = gtk_button_new_with_label
-               (prefs_common.trans_hdr ? _("Cc:") : "Cc:");
+               (prefs_common_translated_header_name("Cc:"));
        GTK_WIDGET_SET_FLAGS(cc_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), cc_btn, TRUE, TRUE, 0);
        bcc_btn = gtk_button_new_with_label
-               (prefs_common.trans_hdr ? _("Bcc:") : "Bcc:");
+               (prefs_common_translated_header_name("Bcc:"));
        GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
 
@@ -1007,10 +1217,13 @@ static void addressbook_create(void)
                                       NULL);
 
        addrbook.window  = window;
+       addrbook.hpaned  = hpaned;
+       addrbook.vpaned  = vpaned;
        addrbook.menubar = menubar;
        addrbook.ctree   = ctree;
        addrbook.ctree_swin
                         = ctree_swin;
+       addrbook.editaddress_vbox = editaddress_vbox;
        addrbook.clist   = clist;
        addrbook.label   = label;
        addrbook.entry   = entry;
@@ -1018,6 +1231,7 @@ static void addressbook_create(void)
        addrbook.status_cid = gtk_statusbar_get_context_id(
                        GTK_STATUSBAR(statusbar), "Addressbook Window" );
 
+       addrbook.help_btn = help_btn;
        addrbook.edit_btn = edit_btn;
        addrbook.del_btn = del_btn;
        addrbook.reg_btn = reg_btn;
@@ -1033,7 +1247,6 @@ static void addressbook_create(void)
        addrbook.menu_factory = menu_factory;
 
        addrbook.listSelected = NULL;
-       address_completion_start(window);
 
        if (!geometry.min_height) {
                geometry.min_width = ADDRESSBOOK_WIDTH;
@@ -1045,6 +1258,16 @@ static void addressbook_create(void)
        gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
                                    prefs_common.addressbookwin_height);
 
+       if (!prefs_common.addressbook_use_editaddress_dialog) {
+               if (prefs_common.addressbook_vpaned_pos > 0)
+                       gtk_paned_set_position(GTK_PANED(vpaned), 
+                               prefs_common.addressbook_vpaned_pos);
+       }       
+       if (prefs_common.addressbook_hpaned_pos > 0)
+               gtk_paned_set_position(GTK_PANED(hpaned), 
+                       prefs_common.addressbook_hpaned_pos);
+
+
        gtk_widget_show_all(window);
 }
 
@@ -1052,6 +1275,12 @@ static void addressbook_create(void)
  * Close address book window and save to file(s).
  */
 static gint addressbook_close( void ) {
+       address_completion_end(addrbook.window);
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_invalidate(NULL, NULL, NULL);
+       
+       addressbook_pane_save_position();
+       
        gtk_widget_hide(addrbook.window);
        addressbook_export_to_file();
        return TRUE;
@@ -1074,22 +1303,6 @@ static void addressbook_status_show( gchar *msg ) {
        }
 }
 
-static void addressbook_ds_status_message( AddressDataSource *ds, gchar *msg ) {
-       *addressbook_msgbuf = '\0';
-       if( ds ) {
-               gchar *name;
-
-               name = addrindex_ds_get_name( ds );
-               g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
-                           "%s: %s", name, msg );
-       }
-       else {
-               g_snprintf( addressbook_msgbuf, sizeof(addressbook_msgbuf),
-                           "%s", msg );
-       }
-       addressbook_status_show( addressbook_msgbuf );
-}
-
 static void addressbook_ds_show_message( AddressDataSource *ds ) {
        gint retVal;
        gchar *name;
@@ -1122,10 +1335,7 @@ static void addressbook_button_set_sensitive(void)
        if (addrbook.target_compose) {
                to_sens = TRUE;
                cc_sens = TRUE;
-#ifndef CLAWS          
-               if (addrbook.target_compose->use_bcc)
-#endif                 
-                       bcc_sens = TRUE;
+               bcc_sens = TRUE;
        }
 
        gtk_widget_set_sensitive(addrbook.to_btn, to_sens);
@@ -1194,22 +1404,43 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        abf = ds->rawDataSource;
        if( abf == NULL ) return;
 
-       /* Confirm deletion */
-       aval = alertpanel( _("Delete address(es)"),
-                       _("Really delete the address(es)?"),
-                       GTK_STOCK_YES, GTK_STOCK_NO, NULL );
-       if( aval != G_ALERTDEFAULT ) return;
 
        /* Process deletions */
        if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
+               gboolean group_delete = TRUE;
                /* Items inside folders */
                list = addrselect_get_list( _addressSelect_ );
+               /* Confirm deletion */
+               node = list;
+               while( node ) {
+                       item = node->data;
+                       node = g_list_next( node );
+                       aio = ( AddrItemObject * ) item->addressItem;
+                       if( aio->type == ADDR_ITEM_PERSON || aio->type == ADDR_ITEM_EMAIL ) {
+                               group_delete = FALSE;
+                               break;
+                       }
+               }
+               if (group_delete) {
+                       aval = alertpanel( _("Delete group"),
+                                       _("Really delete the group(s)?\n"
+                                         "The addresses it contains will not be lost."),
+                                       GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+                       if( aval != G_ALERTALTERNATE ) return;
+               } else {
+                       aval = alertpanel( _("Delete address(es)"),
+                                       _("Really delete the address(es)?"),
+                                       GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+                       if( aval != G_ALERTALTERNATE ) return;
+               }
 
                node = list;
                while( node ) {
                        item = node->data;
                        node = g_list_next( node );
                        aio = ( AddrItemObject * ) item->addressItem;
+                       if (!aio)
+                               continue;
                        if( aio->type == ADDR_ITEM_GROUP ) {
                                ItemGroup *item = ( ItemGroup * ) aio;
                                GtkCTreeNode *nd = NULL;
@@ -1225,11 +1456,23 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                        }
                        else if( aio->type == ADDR_ITEM_PERSON ) {
                                ItemPerson *item = ( ItemPerson * ) aio;
+                               item->status = DELETE_ENTRY; 
                                addressbook_folder_remove_one_person( clist, item );
                                if (pobj->type == ADDR_ITEM_FOLDER)
                                        addritem_folder_remove_person(ADAPTER_FOLDER(pobj)->itemFolder, item);
                                item = addrbook_remove_person( abf, item );
+#ifdef USE_LDAP
+                               if (ds && ds->type == ADDR_IF_LDAP) {
+                                       LdapServer *server = ds->rawDataSource;
+                                       ldapsvr_set_modified(server, TRUE);
+                                       ldapsvr_update_book(server, item);
+                               }
+#endif
                                if( item ) {
+                                       gchar *filename = addritem_person_get_picture(item);
+                                       if (filename && is_file_exist(filename))
+                                               g_unlink(filename);
+                                       g_free(filename);
                                        addritem_free_item_person( item );
                                }
                        }
@@ -1238,6 +1481,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
                                item = addrbook_person_remove_email( abf, person, item );
                                if( item ) {
+                                       addrcache_remove_email(abf->addressCache, item);
                                        addritem_free_item_email( item );
                                }
                                addressbook_folder_refresh_one_person( clist, person );
@@ -1298,7 +1542,7 @@ static void addressbook_reg_clicked(GtkButton *button, gpointer data)
        addressbook_new_address_cb( NULL, 0, NULL );
 }
 
-gchar *addressbook_format_address( AddrItemObject * aio ) {
+static gchar *addressbook_format_address( AddrItemObject * aio ) {
        gchar *buf = NULL;
        gchar *name = NULL;
        gchar *address = NULL;
@@ -1370,30 +1614,41 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
        /* Select from address list */
        list = addrselect_get_list( _addressSelect_ );
        node = list;
-       while( node ) {
-               item = node->data;
-               node = g_list_next( node );
-               aio = item->addressItem;
-               if( aio->type == ADDR_ITEM_PERSON ||
-                   aio->type == ADDR_ITEM_EMAIL ) {
-                       addr = addressbook_format_address( aio );
-                       compose_entry_append(
-                               compose, addr, (ComposeEntryType) data );
-                       g_free( addr );
-               }
-               else if( aio->type == ADDR_ITEM_GROUP ) {
-                       ItemGroup *group = ( ItemGroup * ) aio;
-                       AddressDataSource *ds = NULL;
-                       AddressBookFile *abf = NULL;
-                       GList *nodeMail = group->listEMail;
-                       if (nodeMail == NULL) {
-                               if(addrbook.treeSelected ) {
-                                       ds = addressbook_find_datasource( addrbook.treeSelected );
-                                       abf = ds->rawDataSource;
-                                       if( abf != NULL )
-                                               nodeMail = addrbook_get_available_email_list( abf, group );
+       if (node) {
+               while( node ) {
+                       item = node->data;
+                       node = g_list_next( node );
+                       aio = item->addressItem;
+                       if( aio->type == ADDR_ITEM_PERSON ||
+                           aio->type == ADDR_ITEM_EMAIL ) {
+                               addr = addressbook_format_address( aio );
+                               compose_entry_append(
+                                       compose, addr, (ComposeEntryType) data );
+                               g_free( addr );
+                       }
+                       else if( aio->type == ADDR_ITEM_GROUP ) {
+                               ItemGroup *group = ( ItemGroup * ) aio;
+                               GList *nodeMail = group->listEMail;
+                               while( nodeMail ) {
+                                       ItemEMail *email = nodeMail->data;
+
+                                       addr = addressbook_format_address(
+                                                       ( AddrItemObject * ) email );
+                                       compose_entry_append(
+                                               compose, addr, (ComposeEntryType) data );
+                                       g_free( addr );
+                                       nodeMail = g_list_next( nodeMail );
                                }
                        }
+               }
+       } else {
+               AddressObject *obj = NULL;
+
+               obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+       
+               if( obj && obj->type == ADDR_ITEM_GROUP ) {
+                       ItemGroup *itemGroup = ADAPTER_GROUP(obj)->itemGroup;
+                       GList *nodeMail = itemGroup->listEMail;
                        while( nodeMail ) {
                                ItemEMail *email = nodeMail->data;
 
@@ -1485,7 +1740,8 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
                }
        }
 
-       if( addrbook.listSelected == NULL ) canEdit = FALSE;
+       if( addrbook.listSelected == NULL )
+               canEdit = FALSE;
 
        /* Enable add */
        menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", editAddress );
@@ -1507,8 +1763,6 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
        menu_set_sensitive( addrbook.menu_factory, "/Tools/Export LDIF...", canExport );
 }
 
-static void addressbook_list_menu_setup( void );
-
 /**
  * Address book tree callback function that responds to selection of tree
  * items.
@@ -1565,10 +1819,10 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
 
                        /* Load folders into the tree */
                        rootFolder = addrindex_ds_get_root_folder( ds );
-                       if( ds->type == ADDR_IF_JPILOT ) {
+                       if( ds && ds->type == ADDR_IF_JPILOT ) {
                                aot = ADDR_CATEGORY;
                        }
-                       else if( ds->type == ADDR_IF_LDAP ) {
+                       else if( ds && ds->type == ADDR_IF_LDAP ) {
                                aot = ADDR_LDAP_QUERY;
                        }
                        else {
@@ -1578,6 +1832,8 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
                        addrindex_ds_set_access_flag( ds, &tVal );
                        gtk_ctree_expand( ctree, node );
                }
+       } else {
+               addressbook_set_clist(NULL, TRUE);
        }
 
        /* Update address list */
@@ -1588,12 +1844,12 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
        g_signal_handlers_unblock_by_func
                (G_OBJECT(ctree),
                 G_CALLBACK(addressbook_tree_selected), NULL);
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_invalidate(NULL, NULL, NULL);
 
        /* Setup main menu selections */
        addressbook_menubar_set_sensitive( FALSE );
-       addressbook_list_menu_setup();
        addressbook_menuitem_set_sensitive( obj, node );
-
        addressbook_list_select_clear();
        addressbook_list_menu_setup();
        return;
@@ -1631,21 +1887,29 @@ static void addressbook_list_menu_setup( void ) {
                /* Parent object is a data source */
                ads = ADAPTER_DSOURCE(pobj);
                ds = ads->dataSource;
+               if (!ds)
+                       return;
                iface = ds->interface;
+               if (!iface)
+                       return;
                if( ! iface->readOnly ) {
                        menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
-                       menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+                       if (iface->type != ADDR_IF_LDAP)
+                               menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
-                       if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
-                       if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
-                       if( obj ) canEdit = TRUE;
+                       if( obj )
+                               canEdit = TRUE;
+                       canDelete = canEdit;
                }
-               canDelete = canEdit;
        }
        else if( pobj->type != ADDR_INTERFACE ) {
                /* Parent object is not an interface */
                ds = addressbook_find_datasource( addrbook.treeSelected );
+               if (!ds)
+                       return;
                iface = ds->interface;
+               if (!iface)
+                       return;
                if( ! iface->readOnly ) {
                        /* Folder or group */
                        if( pobj->type == ADDR_ITEM_FOLDER || pobj->type == ADDR_ITEM_GROUP ) {
@@ -1655,20 +1919,29 @@ static void addressbook_list_menu_setup( void ) {
                        }
                        /* Folder */
                        if( pobj->type == ADDR_ITEM_FOLDER ) {
-                               menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+                               if (iface->type != ADDR_IF_LDAP)
+                                       menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
                                if( obj ) canEdit = TRUE;
                        }
-                       if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
-                       if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
                        canDelete = canEdit;
                }
                if( iface->type == ADDR_IF_LDAP ) {
                        if( obj ) canBrowse = TRUE;
                        canEdit = TRUE;
-                       canDelete = FALSE;
+                       canDelete = TRUE;
                }
        }
-       if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
+
+       if( iface ) {
+               /* Enable cut and paste */
+               if( ! addrclip_is_empty( _clipBoard_ ) )
+                       canPaste = TRUE;
+               if( ! addrselect_test_empty( _addressSelect_ ) )
+                       canCut = TRUE;
+               /* Enable copy if something is selected */
+               if( ! addrselect_test_empty( _addressSelect_ ) )
+                       canCopy = TRUE;
+       }
 
        /* Disable edit or browse if more than one row selected */
        if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
@@ -1676,6 +1949,13 @@ static void addressbook_list_menu_setup( void ) {
                canBrowse = FALSE;
        }
 
+       /* Forbid write changes when read-only */
+       if( iface && iface->readOnly ) {
+               canCut = FALSE;
+               canDelete = FALSE;
+               canPaste = FALSE;
+       }
+
        /* Now go finalize menu items */
        menu_set_sensitive( addrbook.list_factory, "/Edit",   canEdit );
        menu_set_sensitive( addrbook.list_factory, "/Delete", canDelete );
@@ -1683,18 +1963,12 @@ static void addressbook_list_menu_setup( void ) {
        menu_set_sensitive( addrbook.list_factory, "/Cut",           canCut );
        menu_set_sensitive( addrbook.list_factory, "/Copy",          canCopy );
        menu_set_sensitive( addrbook.list_factory, "/Paste",         canPaste );
-/*     menu_set_sensitive( addrbook.list_factory, "/Paste Address", canPaste );*/
 
        menu_set_sensitive( addrbook.list_factory, "/Mail To",       canCopy );
 
        menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",           canCut );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",          canCopy );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Paste",         canPaste );
-/*     menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );*/
-
-       menu_set_sensitive( addrbook.tree_factory, "/Cut",             canCut );
-       menu_set_sensitive( addrbook.tree_factory, "/Copy",            canCopy );
-       menu_set_sensitive( addrbook.tree_factory, "/Paste",           canPaste );
 
        menu_set_sensitive( addrbook.menu_factory, "/Address/Edit",    canEdit );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Delete",  canDelete );
@@ -1787,8 +2061,7 @@ static void addressbook_clip_paste_cb( void ) {
        ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
        if( ds == NULL ) return;
        if( addrindex_ds_get_readonly( ds ) ) {
-               addressbook_ds_status_message(
-                       ds, _( "Cannot paste. Target address book is readonly." ) );
+               alertpanel_error( _("Cannot paste. Target address book is readonly.") );
                return;
        }
 
@@ -1798,8 +2071,7 @@ static void addressbook_clip_paste_cb( void ) {
                        folder = ADAPTER_FOLDER(pobj)->itemFolder;
                }
                else if( pobj->type == ADDR_ITEM_GROUP ) {
-                       addressbook_ds_status_message(
-                               ds, _( "Cannot paste into an address group." ) );
+                       alertpanel_error( _("Cannot paste into an address group.") );
                        return;
                }
        }
@@ -1846,77 +2118,6 @@ static void addressbook_clip_paste_cb( void ) {
 
 }
 
-#if 0
-/**
- * Paste clipboard email addresses only into address list widget.
- */
-static void addressbook_clip_paste_address_cb( void ) {
-       GtkCTree *clist = GTK_CTREE(addrbook.clist);
-       GtkCTree *ctree;
-       AddressObject *pobj = NULL;
-       AddressDataSource *ds = NULL;
-       AddressBookFile *abf = NULL;
-       ItemFolder *folder = NULL;
-       AddrItemObject *aio;
-       gint cnt;
-
-       if( addrbook.listSelected == NULL ) return;
-
-               ctree = GTK_CTREE( addrbook.ctree );
-       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
-       if( ds == NULL ) return;
-       if( addrindex_ds_get_readonly( ds ) ) {
-               addressbook_ds_status_message(
-                       ds, _( "Cannot paste. Target address book is readonly." ) );
-               return;
-       }
-
-       pobj = gtk_ctree_node_get_row_data( ctree, addrbook.treeSelected );
-       if( pobj ) {
-               if( pobj->type == ADDR_ITEM_FOLDER ) {
-                       folder = ADAPTER_FOLDER(pobj)->itemFolder;
-               }
-       }
-
-       abf = addressbook_get_book_file();
-       if( abf == NULL ) return;
-
-       cnt = 0;
-       aio = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
-       if( aio->type == ADDR_ITEM_PERSON ) {
-               ItemPerson *person;
-
-               person = ( ItemPerson * ) aio;
-               if( _clipBoard_->cutFlag ) {
-                       /* Paste/Cut */
-                       cnt = addrclip_paste_person_cut( _clipBoard_, abf, person );
-
-                       /* Remove all "cut" items */
-                       addrclip_delete_address( _clipBoard_ );
-
-                       /* Clear clipboard */
-                       addrclip_clear( _clipBoard_ );
-               }
-               else {
-                       /* Paste/Copy */
-                       cnt = addrclip_paste_person_copy( _clipBoard_, abf, person );
-               }
-               if( cnt > 0 ) {
-                       addritem_person_set_opened( person, TRUE );
-               }
-       }
-
-       /* Display items pasted */
-       if( cnt > 0 ) {
-               gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
-               addressbook_set_clist(
-                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
-                               addrbook.opened),
-                       TRUE);
-       }
-}
-#endif
-
 /**
  * Add current treenode object to clipboard. Note that widget only allows
  * one entry from the tree list to be selected.
@@ -2067,11 +2268,18 @@ static void addressbook_list_row_selected( GtkCTree *clist,
 
        aio = gtk_ctree_node_get_row_data( clist, node );
        if( aio ) {
-               /* printf( "list select: %d : '%s'\n", aio->type, aio->name ); */
+               /* g_print( "list select: %d : '%s'\n", aio->type, aio->name ); */
                addressbook_list_select_add( aio, ds );
        }
 
        addressbook_list_menu_setup();
+
+       if (!addrbook.target_compose && !prefs_common.addressbook_use_editaddress_dialog) {
+               AddressObject *obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
+
+               if (obj && obj->type != ADDR_ITEM_GROUP)
+                       addressbook_edit_address(NULL, 0, NULL, FALSE);
+       }
 }
 
 static void addressbook_list_row_unselected( GtkCTree *ctree,
@@ -2083,9 +2291,12 @@ static void addressbook_list_row_unselected( GtkCTree *ctree,
 
        aio = gtk_ctree_node_get_row_data( ctree, node );
        if( aio != NULL ) {
-               /* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
+               /* g_print( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
                addressbook_list_select_remove( aio );
        }
+
+       if (!prefs_common.addressbook_use_editaddress_dialog)
+               addressbook_edit_person_invalidate(NULL, NULL, NULL);
 }
 
 /* from gdkevents.c */
@@ -2109,7 +2320,14 @@ static gboolean addressbook_list_button_pressed(GtkWidget *widget,
                            addrbook.target_compose)
                                addressbook_to_clicked(NULL, GINT_TO_POINTER(COMPOSE_TO));
                        else
-                               addressbook_edit_address_cb(NULL, 0, NULL);
+                               if (prefs_common.addressbook_use_editaddress_dialog)
+                                       addressbook_edit_address_cb(NULL, 0, NULL);
+                               else {
+                                       GtkCTree *clist = GTK_CTREE(addrbook.clist);
+                                       AddressObject *obj = gtk_ctree_node_get_row_data( clist, addrbook.listSelected );
+                                       if( obj && obj->type == ADDR_ITEM_GROUP )
+                                               addressbook_edit_address_cb(NULL, 0, NULL);
+                               }
 
                        lasttime = 0;
                } else
@@ -2145,6 +2363,7 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        gboolean canTreeCopy = FALSE;
        gboolean canTreePaste = FALSE;
        gboolean canLookup = FALSE;
+       GtkCTreeNode *node = NULL;
 
        if( ! event ) return FALSE;
        addressbook_menubar_set_sensitive( FALSE );
@@ -2157,46 +2376,55 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
        menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
 
        if( obj == NULL ) return FALSE;
+       node = gtk_ctree_node_nth(GTK_CTREE(clist), row);
 
        if( ! addrclip_is_empty( _clipBoard_ ) ) {
                canTreePaste = TRUE;
        }
-
+       if (obj->type == ADDR_INTERFACE) {
+               AdapterInterface *adapter = ADAPTER_INTERFACE(obj);
+               if( !adapter )
+                       goto just_set_sens;
+               iface = adapter->interface;
+               if( !iface )
+                       goto just_set_sens;
+               if( !iface->readOnly ) {
+                       menu_set_sensitive( addrbook.tree_factory, "/New Book", TRUE );
+                       gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+               }
+               if( iface->externalQuery ) canLookup = TRUE;
+       }
        if (obj->type == ADDR_DATASOURCE) {
                ads = ADAPTER_DSOURCE(obj);
                ds = ads->dataSource;
-               if (!ds)
+               if( !ds )
                        goto just_set_sens;
                iface = ds->interface;
-               if (!iface)
+               if( !iface )
                        goto just_set_sens;
-               canEdit = TRUE;
-               canDelete = TRUE;
-               if( iface->readOnly ) {
-                       canTreePaste = FALSE;
-               }
-               else {
+               if( !iface->readOnly ) {
+                       canDelete = TRUE;
                        menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+                       menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
+               canEdit = TRUE;
                canTreeCopy = TRUE;
                if( iface->externalQuery ) canLookup = TRUE;
        }
        else if (obj->type == ADDR_ITEM_FOLDER) {
-               ds = addressbook_find_datasource( addrbook.treeSelected );
-               if (!ds)
+               ds = addressbook_find_datasource( node );
+               if( !ds )
                        goto just_set_sens;
                iface = ds->interface;
-               if (!iface)
+               if( !iface )
                        goto just_set_sens;
-               if( iface->readOnly ) {
-                       canTreePaste = FALSE;
-               }
-               else {
+               if( !iface->readOnly ) {
                        canEdit = TRUE;
                        canDelete = TRUE;
                        canTreeCut = TRUE;
                        menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+                       menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
                canTreeCopy = TRUE;
@@ -2208,11 +2436,11 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                }
        }
        else if (obj->type == ADDR_ITEM_GROUP) {
-               ds = addressbook_find_datasource( addrbook.treeSelected );
-               if (!ds)
+               ds = addressbook_find_datasource( node );
+               if( !ds )
                        goto just_set_sens;
                iface = ds->interface;
-               if (!iface)
+               if( !iface )
                        goto just_set_sens;
                if( ! iface->readOnly ) {
                        canEdit = TRUE;
@@ -2221,15 +2449,24 @@ static gboolean addressbook_tree_button_pressed(GtkWidget *ctree,
                        gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
                }
        }
-       else if (obj->type == ADDR_INTERFACE) {
-               canTreePaste = FALSE;
-       }
 
        if( canEdit ) {
-               if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+               if( ! addrselect_test_empty( _addressSelect_ ) )
+                       canCut = TRUE;
+       }
+       if( ! addrselect_test_empty( _addressSelect_ ) )
+               canCopy = TRUE;
+       if( ! addrclip_is_empty( _clipBoard_ ) )
+               canPaste = TRUE;
+
+       /* Forbid write changes when read-only */
+       if( iface && iface->readOnly ) {
+               canTreeCut = FALSE;
+               canTreePaste = FALSE;
+               canCut = FALSE;
+               canDelete = FALSE;
+               canPaste = FALSE;
        }
-       if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
-       if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
 
 just_set_sens:
        /* Enable edit */
@@ -2244,9 +2481,10 @@ just_set_sens:
        menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",           canCut );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",          canCopy );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Paste",         canPaste );
-/*     menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", canPaste );*/
 
-       addressbook_show_buttons(addrbook.target_compose == NULL, canLookup, addrbook.target_compose != NULL);
+       addressbook_show_buttons(addrbook.target_compose == NULL, canLookup,
+                       addrbook.target_compose != NULL);
+
        if( event->button == 3 ) {
                gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
                               event->button, event->time);
@@ -2530,34 +2768,42 @@ static void addressbook_treenode_delete_cb(
                                "results and addresses in '%s' ?" ),
                                obj->name );
                        aval = alertpanel( _("Delete"), message,
-                               GTK_STOCK_YES, GTK_STOCK_NO, NULL );
+                               GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
                        g_free(message);
-                       if( aval == G_ALERTDEFAULT ) {
+                       if( aval == G_ALERTALTERNATE ) {
                                delType = ADDRTREE_DEL_FOLDER_ADDR;
                        }
                }
                else {
                        message = g_strdup_printf
-                               ( _( "Do you want to delete the folder AND all addresses in '%s' ?\n"
-                                    "If deleting the folder only, addresses will be moved into parent folder." ),
+                               ( _( "Do you want to delete '%s' ?"
+                                    "If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
                                 obj->name );
                        aval = alertpanel( _("Delete folder"), message,
-                               _("_Folder only"), _("Folder and _addresses"),
-                               GTK_STOCK_CANCEL );
+                               GTK_STOCK_CANCEL, _("+Delete _folder only"), _("Delete folder and _addresses"));
                        g_free(message);
-                       if( aval == G_ALERTDEFAULT ) {
+                       if( aval == G_ALERTALTERNATE ) {
                                delType = ADDRTREE_DEL_FOLDER_ONLY;
                        }
-                       else if( aval == G_ALERTALTERNATE ) {
+                       else if( aval == G_ALERTOTHER ) {
                                delType = ADDRTREE_DEL_FOLDER_ADDR;
                        }
                }
        }
-       else {
-               message = g_strdup_printf(_("Really delete '%s' ?"), obj->name);
-               aval = alertpanel(_("Delete"), message, GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+       else if( obj->type == ADDR_ITEM_GROUP ) {
+               message = g_strdup_printf(_("Do you want to delete '%s'?\n"
+                                           "The addresses it contains will not be lost."), obj->name);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL, 
+                               "+" GTK_STOCK_DELETE, NULL);
+               g_free(message);
+               if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_FOLDER_ONLY;
+       } else {
+               message = g_strdup_printf(_("Do you want to delete '%s'?\n"
+                                           "The addresses it contains will be lost."), obj->name);
+               aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL, 
+                               "+" GTK_STOCK_DELETE, NULL);
                g_free(message);
-               if( aval == G_ALERTDEFAULT ) delType = ADDRTREE_DEL_DATA;
+               if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
        }
        if( delType == ADDRTREE_DEL_NONE ) return;
 
@@ -2585,12 +2831,12 @@ static void addressbook_treenode_delete_cb(
 
                adapter->itemFolder = NULL;
                /*
-               printf( "remove folder for ::%s::\n", obj->name );
-               printf( "      folder name ::%s::\n", ADDRITEM_NAME(folder) );
-               printf( "-------------- remove results\n" );
+               g_print( "remove folder for ::%s::\n", obj->name );
+               g_print( "      folder name ::%s::\n", ADDRITEM_NAME(folder) );
+               g_print( "-------------- remove results\n" );
                */
                addrindex_remove_results( ds, folder );
-               /* printf( "-------------- remove node\n" ); */
+               /* g_print( "-------------- remove node\n" ); */
                gtk_ctree_remove_node( ctree, node );
                return;
        }
@@ -2635,43 +2881,247 @@ static void addressbook_treenode_delete_cb(
        }
 }
 
-static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
-       AddressObject *pobj = NULL;
-       AddressDataSource *ds = NULL;
-       AddressBookFile *abf = NULL;
-
-       pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
-       if( pobj == NULL ) return;
-       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
-       if( ds == NULL ) return;
+static void addressbook_new_address_from_book_post_cb( ItemPerson *person )
+{
+       if( person && addrbook.treeSelected == addrbook.opened ) {
+               person->status = ADD_ENTRY;
+               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+               addressbook_folder_refresh_one_person(
+                       GTK_CTREE(addrbook.clist), person );
+       }
+       addressbook_address_list_set_focus();
+}
+
+static void addressbook_new_address_from_folder_post_cb( ItemPerson *person )
+{
+       if( person && addrbook.treeSelected == addrbook.opened) {
+               person->status = ADD_ENTRY;
+               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+               addressbook_set_clist(
+                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+                               addrbook.opened),
+                       TRUE);
+       }
+       addressbook_address_list_set_focus();
+}
+
+/**
+ * Label (a format string) that is used to name each folder.
+ */
+static gchar *_queryFolderLabel_ = N_( "Search '%s'" );
+
+/**
+ * Search ctree widget callback function.
+ * \param  pA Pointer to node.
+ * \param  pB Pointer to data item being sought.
+ * \return Zero (0) if folder found.
+ */
+static int addressbook_treenode_find_folder_cb( gconstpointer pA, gconstpointer pB ) {
+       AddressObject *aoA;
+
+       aoA = ( AddressObject * ) pA;
+       if( aoA->type == ADDR_ITEM_FOLDER ) {
+               ItemFolder *folder, *fld;
+
+               fld = ADAPTER_FOLDER(aoA)->itemFolder;
+               folder = ( ItemFolder * ) pB;
+               if( fld == folder ) return 0;   /* Found folder */
+       }
+       return 1;
+}
+
+static ItemFolder * addressbook_setup_subf(
+               AddressDataSource *ds, gchar *title,
+               GtkCTreeNode *pNode )
+{
+       AddrBookBase *adbase;
+       AddressCache *cache;
+       ItemFolder *folder;
+       GtkCTree *ctree;
+       GtkCTreeNode *nNode;
+       gchar *name;
+       AddressObjectType aoType = ADDR_NONE;
+       GList *children;
+       /* Setup a query */
+       if( *title == '\0' || strlen( title ) < 1 ) return NULL;
+
+       if( ds && ds->type == ADDR_IF_LDAP ) {
+#if USE_LDAP
+               aoType = ADDR_LDAP_QUERY;
+#endif
+       }
+       else {
+               return NULL;
+       }
+
+       ctree = GTK_CTREE(addrbook.ctree);
+       /* Get reference to address cache */    
+       adbase = ( AddrBookBase * ) ds->rawDataSource;
+       cache = adbase->addressCache;
+       
+       if ((children = addrcache_get_list_folder(cache)) != NULL) {
+               GList *cur = children;
+               for (; cur; cur = cur->next) {
+                       ItemFolder *child = (ItemFolder *) cur->data;
+                       if (!strcmp2(ADDRITEM_NAME(child), title)) {
+                               nNode = gtk_ctree_find_by_row_data_custom(
+                                       ctree, NULL, child,
+                                       addressbook_treenode_find_folder_cb );
+                               if( nNode ) {
+                                       addrindex_remove_results( ds, child );
+                                       while( child->listPerson ) {
+                                               ItemPerson *item = ( ItemPerson * ) child->listPerson->data;
+                                               item = addrcache_remove_person( cache, item );
+                                               if( item ) {
+                                                       addritem_free_item_person( item );
+                                                       item = NULL;
+                                               }
+                                       }
+                                       gtk_sctree_select( GTK_SCTREE(ctree), nNode );
+                                       addrbook.treeSelected = nNode;
+                               }       
+                               return child;
+                       }
+               }
+       }
+       
+       /* Create a folder */
+       folder = addrcache_add_new_folder( cache, NULL );
+       name = g_strdup_printf( "%s", title );
+       addritem_folder_set_name( folder, name );
+       addritem_folder_set_remarks( folder, "" );
+       g_free( name );
+
+       /* Now let's see the folder */
+       nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
+       gtk_ctree_expand( ctree, pNode );
+       if( nNode ) {
+               gtk_sctree_select( GTK_SCTREE(ctree), nNode );
+               addrbook.treeSelected = nNode;
+               return folder;
+       }
+       return NULL;
+}
+
+static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+       AddressObject *pobj = NULL;
+       AddressDataSource *ds = NULL;
+       AddressBookFile *abf = NULL;
+       debug_print("adding address\n");
+       pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+       if( pobj == NULL ) {
+               debug_print("no row data\n");
+               return;
+       }
+       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+       if( ds == NULL ) {
+               debug_print("no datasource\n");
+               return;
+       }
 
        abf = ds->rawDataSource;
-       if( abf == NULL ) return;
+       if( abf == NULL ) {
+               g_print("no addressbook file\n");
+               return;
+       }
 
        if( pobj->type == ADDR_DATASOURCE ) {
-               if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
-                       /* New address */
-                       ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
-                       if( person && addrbook.treeSelected == addrbook.opened ) {
-                               gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
-                               addressbook_folder_refresh_one_person(
-                                       GTK_CTREE(addrbook.clist), person );
+               if (ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ||
+                   ADAPTER_DSOURCE(pobj)->subType == ADDR_LDAP) {
+                       ItemPerson *person;
+                       ItemFolder *folder = NULL;
+#ifdef USE_LDAP
+                       if (abf && abf->type == ADDR_IF_LDAP) {
+                               GtkCTreeNode *parentNode;
+                               ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
+                               if( ds == NULL ) return;
+
+                               /* We must have a datasource that is an external interface */
+                               if( ! ds->interface->haveLibrary ) return;
+                               if( ! ds->interface->externalQuery ) return;
+
+                               if( pobj->type == ADDR_ITEM_FOLDER ) {
+                                       parentNode = GTK_CTREE_ROW(GTK_CTREE_NODE( addrbook.treeSelected ) )->parent;
+                               }
+                               else {
+                                       parentNode = GTK_CTREE_NODE( addrbook.treeSelected );
+                               }
+                               folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
+
+                               pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+                               ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+                               abf = ds->rawDataSource;
+                       }
+#endif
+                       person = addressbook_edit_person( abf, folder, NULL, FALSE,
+                                                                 addrbook.editaddress_vbox,
+                                                                 addressbook_new_address_from_book_post_cb,
+                                                                 TRUE );
+#ifdef USE_LDAP
+                       if (abf && abf->type == ADDR_IF_LDAP) {
+                               LdapServer *server = ds->rawDataSource;
+                               ldapsvr_set_modified(server, TRUE);
+                               ldapsvr_update_book(server, NULL);
+                               if (server->retVal != LDAPRC_SUCCESS) {
+                                       alertpanel( _("Add address(es)"),
+                                               addressbook_err2string(_lutErrorsLDAP_, server->retVal),
+                                               GTK_STOCK_CLOSE, NULL, NULL );
+                                       server->retVal = LDAPRC_SUCCESS;
+                                       return;
+                               }
                        }
+#endif
+                       if (prefs_common.addressbook_use_editaddress_dialog)
+                               addressbook_new_address_from_book_post_cb( person );
                }
        }
        else if( pobj->type == ADDR_ITEM_FOLDER ) {
                /* New address */
                ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
-               ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
-               if( person ) {
-                       if (addrbook.treeSelected == addrbook.opened) {
-                               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
-                               addressbook_set_clist(
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
-                                               addrbook.opened),
-                                       TRUE);
+               ItemPerson *person;
+#ifdef USE_LDAP
+               if (abf && abf->type == ADDR_IF_LDAP) {
+                       GtkCTreeNode *parentNode;
+                       ds = addressbook_find_datasource( GTK_CTREE_NODE( addrbook.treeSelected ) );
+                       if( ds == NULL ) return;
+
+                       /* We must have a datasource that is an external interface */
+                       if( ! ds->interface->haveLibrary ) return;
+                       if( ! ds->interface->externalQuery ) return;
+
+                       if( pobj->type == ADDR_ITEM_FOLDER ) {
+                               parentNode = GTK_CTREE_ROW(GTK_CTREE_NODE( addrbook.treeSelected ) )->parent;
+                       }
+                       else {
+                               parentNode = GTK_CTREE_NODE( addrbook.treeSelected );
                        }
+                       folder = addressbook_setup_subf( ds, _("New Contacts"), parentNode );
+                       if (!folder)
+                               return;
+                       pobj = gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree), addrbook.treeSelected);
+                       ds = addressbook_find_datasource( GTK_CTREE_NODE(addrbook.treeSelected) );
+                       abf = ds->rawDataSource;
                }
+#endif
+               person = addressbook_edit_person( abf, folder, NULL, FALSE,
+                                                         addrbook.editaddress_vbox,
+                                                         addressbook_new_address_from_folder_post_cb,
+                                                         TRUE );
+#ifdef USE_LDAP
+               if (abf && abf->type == ADDR_IF_LDAP) {
+                       LdapServer *server = ds->rawDataSource;
+                       ldapsvr_set_modified(server, TRUE);
+                       ldapsvr_update_book(server, NULL);
+                       if (server->retVal != LDAPRC_SUCCESS) {
+                               alertpanel( _("Add address(es)"),
+                                               addressbook_err2string(_lutErrorsLDAP_, server->retVal),
+                                       GTK_STOCK_CLOSE, NULL, NULL );
+                               return;
+                       }
+               }
+#endif
+               if (prefs_common.addressbook_use_editaddress_dialog)
+                       addressbook_new_address_from_folder_post_cb( person );
        }
        else if( pobj->type == ADDR_ITEM_GROUP ) {
                /* New address in group */
@@ -2722,7 +3172,7 @@ static AddressBookFile *addressbook_get_book_file() {
 
        ds = addressbook_find_datasource( addrbook.treeSelected );
        if( ds == NULL ) return NULL;
-       if( ds->type == ADDR_IF_BOOK ) abf = ds->rawDataSource;
+       if( ds->type == ADDR_IF_BOOK || ds->type == ADDR_IF_LDAP ) abf = ds->rawDataSource;
        return abf;
 }
 
@@ -2752,7 +3202,41 @@ static void addressbook_move_nodes_up( GtkCTree *ctree, GtkCTreeNode *node ) {
        }
 }
 
+static void addressbook_edit_address_post_cb( ItemPerson *person )
+{
+       if( person ) {
+#ifdef USE_LDAP
+               if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+                       addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
+#endif
+               addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
+               invalidate_address_completion();
+       }
+       addressbook_address_list_set_focus();
+}
+
+void addressbook_address_list_set_focus( void )
+{
+       if (!prefs_common.addressbook_use_editaddress_dialog) {
+               gtk_window_set_focus(GTK_WINDOW(addrbook.window), addrbook.clist);
+               addressbook_list_menu_setup();
+       }
+}
+
+void addressbook_address_list_disable_some_actions(void)
+{
+       /* disable address copy/pasting when editing contact's detail (embedded form) */
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Cut",   FALSE );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Copy",  FALSE );
+       menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", FALSE );
+}
+
 static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+       addressbook_edit_address(data, action, widget, TRUE);
+}
+       
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+                                                                         gboolean force_focus ) {
        GtkCTree *clist = GTK_CTREE(addrbook.clist);
        GtkCTree *ctree;
        AddressObject *obj = NULL, *pobj = NULL;
@@ -2791,18 +3275,38 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                        /* Edit person - email page */
                        ItemPerson *person;
                        person = ( ItemPerson * ) ADDRITEM_PARENT(email);
-                       if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
-                       addressbook_folder_refresh_one_person( clist, person );
-                       invalidate_address_completion();
+                       if  ( addressbook_edit_person( abf, NULL, person, TRUE, addrbook.editaddress_vbox,
+                                                                                  addressbook_edit_address_post_cb,
+                                                                                  (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+                                 != NULL ) { 
+#ifdef USE_LDAP
+                               if (abf && abf->type == ADDR_IF_LDAP) {
+                                       ldapsvr_set_modified( (LdapServer *) abf, TRUE );
+                                       person->status = UPDATE_ENTRY;
+                               }
+#endif
+                               if (prefs_common.addressbook_use_editaddress_dialog)
+                                       addressbook_edit_address_post_cb( person );
+                       }
                        return;
                }
        }
        else if( obj->type == ADDR_ITEM_PERSON ) {
                /* Edit person - basic page */
                ItemPerson *person = ( ItemPerson * ) obj;
-               if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
-               invalidate_address_completion();
-               addressbook_folder_refresh_one_person( clist, person );
+               if( addressbook_edit_person( abf, NULL, person, FALSE, addrbook.editaddress_vbox,
+                                                                         addressbook_edit_address_post_cb,
+                                                                         (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+                       != NULL ) {
+#ifdef USE_LDAP
+                               if (abf && abf->type == ADDR_IF_LDAP) {
+                                       ldapsvr_set_modified( (LdapServer *) abf, TRUE );
+                                       person->status = UPDATE_ENTRY;
+                               }
+#endif
+                               if (prefs_common.addressbook_use_editaddress_dialog)
+                                       addressbook_edit_address_post_cb( person );
+               }
                return;
        }
        else if( obj->type == ADDR_ITEM_GROUP ) {
@@ -2811,6 +3315,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                parentNode = addrbook.treeSelected;
                node = addressbook_find_group_node( parentNode, itemGrp );
                name = ADDRITEM_NAME(itemGrp);
+               invalidate_address_completion();
        }
        else {
                return;
@@ -2887,10 +3392,10 @@ static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
                person = ( ItemPerson * ) ADDRITEM_PARENT(email);
                str = addressbook_format_item_clist( person, email );
                if( str ) {
-                       text[COL_NAME] = str;
+                       text[COL_NAME] = addressbook_set_col_name_guard(str);
                }
                else {
-                       text[COL_NAME] = ADDRITEM_NAME(person);
+                       text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
                }
                text[COL_ADDRESS] = email->address;
                text[COL_REMARKS] = email->remarks;
@@ -2906,6 +3411,17 @@ static void addressbook_load_group( GtkCTree *clist, ItemGroup *itemGroup ) {
        }
 }
 
+gchar *addressbook_set_col_name_guard(gchar *value)
+{
+       gchar *ret = "<not set>";
+       gchar *tmp = g_strdup(value);
+       g_strstrip(tmp);
+       if (tmp !=NULL && *tmp != '\0')
+               ret = value;
+       g_free(tmp);
+       return ret;
+}
+
 static void addressbook_folder_load_one_person(
                GtkCTree *clist, ItemPerson *person,
                AddressTypeControlItem *atci,
@@ -2916,10 +3432,13 @@ static void addressbook_folder_load_one_person(
        gchar *text[N_LIST_COLS];
        gboolean flgFirst = TRUE, haveAddr = FALSE;
        GList *node;
+#ifdef USE_LDAP
+       AddressBookFile *abf = addressbook_get_book_file();
+#endif
 
        if( person == NULL ) return;
 
-       text[COL_NAME] = NULL;
+       text[COL_NAME] = "";
        node = person->listEMail;
        while( node ) {
                ItemEMail *email = node->data;
@@ -2934,10 +3453,23 @@ static void addressbook_folder_load_one_person(
                        /* First email belongs with person */
                        gchar *str = addressbook_format_item_clist( person, email );
                        if( str ) {
-                               text[COL_NAME] = str;
+                               text[COL_NAME] = addressbook_set_col_name_guard(str);
                        }
+#ifdef USE_LDAP
+                       else if( abf && abf->type == ADDR_IF_LDAP && 
+                                person && person->nickName ) {
+                               if (person->nickName) {
+                                       if (strcmp(person->nickName, "") != 0) {
+                                               text[COL_NAME] = addressbook_set_col_name_guard(person->nickName);
+                                       }
+                                       else {
+                                               text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
+                                       }
+                               }
+                       }
+#endif
                        else {
-                               text[COL_NAME] = ADDRITEM_NAME(person);
+                               text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
                        }
                        nodePerson = gtk_sctree_insert_node(
                                        clist, NULL, NULL,
@@ -2965,9 +3497,9 @@ static void addressbook_folder_load_one_person(
        }
        if( ! haveAddr ) {
                /* Have name without EMail */
-               text[COL_NAME] = ADDRITEM_NAME(person);
-               text[COL_ADDRESS] = NULL;
-               text[COL_REMARKS] = NULL;
+               text[COL_NAME] = addressbook_set_col_name_guard(ADDRITEM_NAME(person));
+               text[COL_ADDRESS] = "";
+               text[COL_REMARKS] = "";
                nodePerson = gtk_sctree_insert_node(
                                clist, NULL, NULL,
                                text, FOLDER_SPACING,
@@ -3054,8 +3586,8 @@ static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFold
                ItemGroup *group = items->data;
                if( group == NULL ) continue;
                text[COL_NAME] = ADDRITEM_NAME(group);
-               text[COL_ADDRESS] = NULL;
-               text[COL_REMARKS] = NULL;
+               text[COL_ADDRESS] = "";
+               text[COL_REMARKS] = "";
                nodeGroup = gtk_sctree_insert_node(clist, NULL, NULL,
                                      text, FOLDER_SPACING,
                                      atci->iconXpm, atci->maskXpm,
@@ -3089,26 +3621,6 @@ static int addressbook_treenode_find_group_cb( gconstpointer pA, gconstpointer p
        return 1;
 }
 
-/**
- * Search ctree widget callback function.
- * \param  pA Pointer to node.
- * \param  pB Pointer to data item being sought.
- * \return Zero (0) if folder found.
- */
-static int addressbook_treenode_find_folder_cb( gconstpointer pA, gconstpointer pB ) {
-       AddressObject *aoA;
-
-       aoA = ( AddressObject * ) pA;
-       if( aoA->type == ADDR_ITEM_FOLDER ) {
-               ItemFolder *folder, *fld;
-
-               fld = ADAPTER_FOLDER(aoA)->itemFolder;
-               folder = ( ItemFolder * ) pB;
-               if( fld == folder ) return 0;   /* Found folder */
-       }
-       return 1;
-}
-
 /*
 * Remove folder and group nodes from tree widget for items contained ("cut")
 * in clipboard.
@@ -3171,10 +3683,10 @@ static AddressDataSource *addressbook_find_datasource( GtkCTreeNode *node ) {
                if( GTK_CTREE_ROW(node)->level < 2 ) return NULL;
                ao = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), node );
                if( ao ) {
-                       /* printf( "ao->type = %d\n", ao->type ); */
+                       /* g_print( "ao->type = %d\n", ao->type ); */
                        if( ao->type == ADDR_DATASOURCE ) {
                                AdapterDSource *ads = ADAPTER_DSOURCE(ao);
-                               /* printf( "found it\n" ); */
+                               /* g_print( "found it\n" ); */
                                ds = ads->dataSource;
                                break;
                        }
@@ -3208,7 +3720,7 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
        }
 
        if( obj->type == ADDR_INTERFACE ) {
-               /* printf( "set_clist: loading datasource...\n" ); */
+               /* g_print( "set_clist: loading datasource...\n" ); */
                /* addressbook_node_load_datasource( GTK_CTREE(clist), obj ); */
                return;
        }
@@ -3242,7 +3754,8 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
                        addressbook_folder_load_group( ctreelist, itemFolder );
                }
        }
-       gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+       gtk_sctree_sort_recursive(GTK_CTREE(clist), NULL);
+       clist->focus_row = -1;
        gtk_clist_thaw(clist);
 }
 
@@ -3382,7 +3895,7 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
                        }
                        else {
                                msg = _("Old address book converted,\n"
-                                       "could not save new address index file" );
+                                       "could not save new address index file." );
                        }
                }
                else {
@@ -3401,7 +3914,7 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
                                }
                                else {
                                        msg = _("Could not convert address book,\n"
-                                               "could not create new address book files." );
+                                               "could not save new address index file." );
                                }
                        }
                        else {
@@ -3426,9 +3939,61 @@ static gboolean addressbook_convert( AddressIndex *addrIndex ) {
        return retVal;
 }
 
+static gboolean migrate_addrbook(const gchar *origdir, const gchar *destdir)
+{
+       DIR *dp;
+       struct dirent *d;
+       gboolean failed = FALSE;
+
+       if( ( dp = opendir( origdir ) ) == NULL ) {
+               return FALSE;
+       }
+       
+       while( ( d = readdir( dp ) ) != NULL ) {
+               if (strncmp(d->d_name, "addrbook-", strlen("addrbook-")))
+                       continue;
+               else {
+                       gchar *orig_file = g_strconcat(origdir, G_DIR_SEPARATOR_S, 
+                                       d->d_name, NULL);
+                       gchar *dest_file = g_strconcat(destdir, G_DIR_SEPARATOR_S, 
+                                       d->d_name, NULL);
+                       if (copy_file(orig_file, dest_file, FALSE) < 0) {
+                               failed = TRUE;
+                       }
+                       g_free(orig_file);
+                       g_free(dest_file);
+                       if (failed) {
+                               break;
+                       }
+               }
+       }
+
+       closedir( dp );
+       if (!failed) {
+               /* all copies succeeded, we can remove source files */
+               if( ( dp = opendir( origdir ) ) == NULL ) {
+                       return FALSE;
+               }
+               while( ( d = readdir( dp ) ) != NULL ) {
+                       if (strncmp(d->d_name, "addrbook-", strlen("addrbook-")))
+                               continue;
+                       else {
+                               gchar *orig_file = g_strconcat(origdir, G_DIR_SEPARATOR_S, 
+                                               d->d_name, NULL);
+                               g_unlink(orig_file);
+                               g_free(orig_file);
+                       }
+               }
+               closedir( dp );
+       }
+       
+       return !failed;
+}
+
 void addressbook_read_file( void ) {
        AddressIndex *addrIndex = NULL;
-
+       gchar *indexdir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, NULL);
+       
        debug_print( "Reading address index...\n" );
        if( _addressIndex_ ) {
                debug_print( "address book already read!!!\n" );
@@ -3439,7 +4004,24 @@ void addressbook_read_file( void ) {
        addrindex_initialize();
 
        /* Use new address book index. */
-       addrindex_set_file_path( addrIndex, get_rc_dir() );
+       
+       if ( !is_dir_exist(indexdir) ) {
+               if ( make_dir(indexdir) < 0 ) {
+                       addrindex_set_file_path( addrIndex, get_rc_dir() );
+                       g_warning( "couldn't create dir %s\n", indexdir);
+               } else {
+                       if (!migrate_addrbook(get_rc_dir(), indexdir)) {
+                               remove_dir_recursive(indexdir);
+                               addrindex_set_file_path( addrIndex, get_rc_dir() );
+                               g_error("couldn't migrate dir %s", indexdir);
+                       } else {
+                               addrindex_set_file_path( addrIndex, indexdir);
+                       }
+               }
+       } else {
+               addrindex_set_file_path( addrIndex, indexdir);
+       }
+       g_free(indexdir);
        addrindex_set_file_name( addrIndex, ADDRESSBOOK_INDEX_FILE );
        addrindex_read_data( addrIndex );
        if( addrIndex->retVal == MGU_NO_FILE ) {
@@ -3640,7 +4222,7 @@ void addressbook_export_to_file( void ) {
 
 static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Return)
+       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
                addressbook_lup_clicked(NULL, NULL);
        return FALSE;
 }
@@ -3662,38 +4244,6 @@ static gint addressbook_treenode_compare_func(
        return g_utf8_collate( name1, name2 );
 }
 
-/*
-* Comparison using object names and types.
-*/
-static gint addressbook_list_compare_func(
-       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
-{
-       AddrItemObject *aio1 = ((GtkCListRow *)ptr1)->data;
-       AddrItemObject *aio2 = ((GtkCListRow *)ptr2)->data;
-       gchar *name1 = NULL, *name2 = NULL;
-
-       /* Order by cell contents */
-       name1 = ADDRITEM_NAME( aio1 );
-       name2 = ADDRITEM_NAME( aio2 );
-
-       if( aio1->type == aio2->type ) {
-               /* Order by name */
-               if( ! name1 ) return ( name2 != NULL );
-               if( ! name2 ) return -1;
-               return g_utf8_collate( name1, name2 );
-       }
-       else {
-               /* Order groups before person */
-               if( aio1->type == ITEMTYPE_GROUP ) {
-                       return -1;
-               }
-               else if( aio2->type == ITEMTYPE_GROUP ) {
-                       return 1;
-               }
-               return 0;
-       }
-}
-
 static void addressbook_new_book_cb( gpointer data, guint action, GtkWidget *widget ) {
        AdapterDSource *ads;
        AdapterInterface *adapter;
@@ -3829,27 +4379,10 @@ static void addressbook_search_idle( gpointer data ) {
        gint queryID;
 
        queryID = GPOINTER_TO_INT( data );
-       printf( "addressbook_ldap_idle... queryID=%d\n", queryID );
+       g_print( "addressbook_ldap_idle... queryID=%d\n", queryID );
        */
 }
 
-/**
- * Search completion callback function. This removes the query from the idle
- * list.
- *
- * \param queryID Query ID of search request.
- */
-void addressbook_clear_idler( gint queryID ) {
-       gpointer ptrQID;
-
-       /* Remove idler function */
-       /* printf( "addressbook_clear_idler::%d::\n", queryID ); */
-       ptrQID = GINT_TO_POINTER( queryID );
-       if( ptrQID ) {
-               gtk_idle_remove_by_data( ptrQID );
-       }
-}
-
 /**
  * Search completion callback function. This removes the query from the idle
  * list.
@@ -3869,7 +4402,7 @@ static void addressbook_search_callback_end(
        /* Remove idler function */
        ptrQID = GINT_TO_POINTER( queryID );
        if( ptrQID ) {
-               gtk_idle_remove_by_data( ptrQID );
+               g_idle_remove_by_data( ptrQID );
        }
 
        /* Refresh addressbook contents */
@@ -3884,11 +4417,6 @@ static void addressbook_search_callback_end(
        addrindex_stop_search( queryID );
 }
 
-/**
- * Label (a format string) that is used to name each folder.
- */
-static gchar *_queryFolderLabel_ = N_( "Search '%s'" );
-
 /**
  * Perform search.
  *
@@ -3903,17 +4431,17 @@ static void addressbook_perform_search(
        AddrBookBase *adbase;
        AddressCache *cache;
        ItemFolder *folder;
-       GtkCTree *ctree;
-       GtkCTreeNode *nNode;
        gchar *name;
        gint queryID;
        guint idleID;
+#ifdef USE_LDAP
        AddressObjectType aoType = ADDR_NONE;
+#endif
 
        /* Setup a query */
        if( *searchTerm == '\0' || strlen( searchTerm ) < 1 ) return;
 
-       if( ds->type == ADDR_IF_LDAP ) {
+       if( ds && ds->type == ADDR_IF_LDAP ) {
 #if USE_LDAP
                aoType = ADDR_LDAP_QUERY;
 #endif
@@ -3921,34 +4449,22 @@ static void addressbook_perform_search(
        else {
                return;
        }
-
        /* Get reference to address cache */    
        adbase = ( AddrBookBase * ) ds->rawDataSource;
        cache = adbase->addressCache;
 
        /* Create a folder for the search results */
-       folder = addrcache_add_new_folder( cache, NULL );
        name = g_strdup_printf( _queryFolderLabel_, searchTerm );
-       addritem_folder_set_name( folder, name );
-       addritem_folder_set_remarks( folder, "" );
+       folder = addressbook_setup_subf(ds, name, pNode);
        g_free( name );
 
-       /* Now let's see the folder */
-       ctree = GTK_CTREE(addrbook.ctree);
-       nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
-       gtk_ctree_expand( ctree, pNode );
-       if( nNode ) {
-               gtk_sctree_select( GTK_SCTREE(ctree), nNode );
-               addrbook.treeSelected = nNode;
-       }
-
        /* Setup the search */
        queryID = addrindex_setup_explicit_search(
                ds, searchTerm, folder, addressbook_search_callback_end, NULL );
        if( queryID == 0 ) return;
 
        /* Set up idler function */
-       idleID = gtk_idle_add(
+       idleID = g_idle_add(
                        ( GtkFunction ) addressbook_search_idle,
                        GINT_TO_POINTER( queryID ) );
 
@@ -4054,7 +4570,7 @@ static void addressbook_browse_entry_cb(void)
                return;
        }
 
-       if( iface->type == ADDR_IF_LDAP ) {
+       if( iface && iface->type == ADDR_IF_LDAP ) {
                browseldap_entry(ds, person->externalID);
        }
 }
@@ -4087,7 +4603,7 @@ ItemObjectType addressbook_type2item( AddressObjectType abType ) {
 /*
 * Build table that controls the rendering of object types.
 */
-void addrbookctl_build_map( GtkWidget *window ) {
+static void addrbookctl_build_map( GtkWidget *window ) {
        AddressTypeControlItem *atci;
 
        /* Build icons */
@@ -4160,7 +4676,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
        atci->showInTree = FALSE;
        atci->treeExpand = FALSE;
        atci->treeLeaf = TRUE;
-       atci->displayName = _( "EMail Address" );
+       atci->displayName = _( "Email Address" );
        atci->iconXpm = addressxpm;
        atci->maskXpm = addressxpmmask;
        atci->iconXpmOpen = addressxpm;
@@ -4256,7 +4772,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
        atci->showInTree = TRUE;
        atci->treeExpand = TRUE;
        atci->treeLeaf = FALSE;
-       atci->displayName = _( "LDAP Server" );
+       atci->displayName = _( "LDAP servers" );
        atci->iconXpm = ldapxpm;
        atci->maskXpm = ldapxpmmask;
        atci->iconXpmOpen = ldapxpm;
@@ -4286,7 +4802,7 @@ void addrbookctl_build_map( GtkWidget *window ) {
 /*
 * Search for specified object type.
 */
-AddressTypeControlItem *addrbookctl_lookup( gint ot ) {
+static AddressTypeControlItem *addrbookctl_lookup( gint ot ) {
        gint objType = ot;
        return ( AddressTypeControlItem * ) g_hash_table_lookup( _addressBookTypeHash_, &objType );
 }
@@ -4294,7 +4810,7 @@ AddressTypeControlItem *addrbookctl_lookup( gint ot ) {
 /*
 * Search for specified interface type.
 */
-AddressTypeControlItem *addrbookctl_lookup_iface( AddressIfType ifType ) {
+static AddressTypeControlItem *addrbookctl_lookup_iface( AddressIfType ifType ) {
        GList *node = _addressBookTypeList_;
        while( node ) {
                AddressTypeControlItem *atci = node->data;
@@ -4343,7 +4859,7 @@ static void addrbookctl_free_group( AdapterGroup *adapter ) {
 /**
  * Build GUI interface list.
  */
-void addrbookctl_build_iflist( void ) {
+static void addrbookctl_build_iflist( void ) {
        AddressTypeControlItem *atci;
        AdapterInterface *adapter;
        GList *list = NULL;
@@ -4377,24 +4893,12 @@ void addrbookctl_build_iflist( void ) {
        }
 }
 
-#if 0
-void addrbookctl_free_selection( GList *list ) {
-       GList *node = list;
-       while( node ) {
-               AdapterInterface *adapter = node->data;
-               adapter = NULL;
-               node = g_list_next( node );
-       }
-       g_list_free( list );
-}
-#endif
-
 /**
  * Find GUI interface type specified interface type.
  * \param  ifType Interface type.
  * \return Interface item, or NULL if not found.
  */
-AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
+static AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
        GList *node = _addressInterfaceList_;
        while( node ) {
                AdapterInterface *adapter = node->data;
@@ -4407,7 +4911,7 @@ AdapterInterface *addrbookctl_find_interface( AddressIfType ifType ) {
 /**
  * Build interface list selection.
  */
-void addrbookctl_build_ifselect( void ) {
+static void addrbookctl_build_ifselect( void ) {
        GList *newList = NULL;
        gchar *selectStr;
        gchar **splitStr;
@@ -4423,7 +4927,7 @@ void addrbookctl_build_ifselect( void ) {
        splitStr = g_strsplit( selectStr, ",", -1 );
        for( i = 0; i < ADDRESSBOOK_MAX_IFACE; i++ ) {
                if( splitStr[i] ) {
-                       /* printf( "%d : %s\n", i, splitStr[i] ); */
+                       /* g_print( "%d : %s\n", i, splitStr[i] ); */
                        ifType = strtol( splitStr[i], &endptr, 10 );
                        enabled = TRUE;
                        if( *endptr ) {
@@ -4431,7 +4935,7 @@ void addrbookctl_build_ifselect( void ) {
                                        enabled = FALSE;
                                }
                        }
-                       /* printf( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
+                       /* g_print( "\t%d : %s\n", ifType, enabled ? "yes" : "no" ); */
                        adapter = addrbookctl_find_interface( ifType );
                        if( adapter ) {
                                newList = g_list_append( newList, adapter );
@@ -4441,7 +4945,7 @@ void addrbookctl_build_ifselect( void ) {
                        break;
                }
        }
-       /* printf( "i=%d\n", i ); */
+       /* g_print( "i=%d\n", i ); */
        g_strfreev( splitStr );
        g_free( selectStr );
 
@@ -4461,16 +4965,220 @@ void addrbookctl_build_ifselect( void ) {
  * This function is used by the Add sender to address book function.
  */
 gboolean addressbook_add_contact(
-               const gchar *name, const gchar *address, const gchar *remarks )
+               const gchar *name, const gchar *address, const gchar *remarks,
+               GdkPixbuf *picture )
 {
        debug_print( "addressbook_add_contact: name/address: %s - %s\n", name, address );
-       if( addressadd_selection( _addressIndex_, name, address, remarks ) ) {
+       if( addressadd_selection( _addressIndex_, name, address, remarks, picture ) ) {
                debug_print( "addressbook_add_contact - added\n" );
                addressbook_refresh();
        }
        return TRUE;
 }
 
+/* ***********************************************************************
+ * Book/folder selection.
+ * ***********************************************************************
+ */
+
+/*
+ * This function is used by the matcher dialog to select a book/folder.
+ */
+gchar *addressbook_folder_selection( const gchar *folderpath)
+{
+       AddressBookFile *book = NULL;
+       ItemFolder *folder = NULL;
+       gchar *path = NULL;
+
+       g_return_val_if_fail( folderpath != NULL, NULL);
+
+       if ( addressbook_foldersel_selection( _addressIndex_, &book, &folder, folderpath )
+               && book != NULL ) {
+               if ( folder != NULL) {
+                       gchar *tmp = NULL;
+                       gchar *oldtmp = NULL;
+                       AddrItemObject *obj = NULL;
+
+                       /* walk thru folder->parent to build the full folder path */
+                       /* TODO: wwp: optimize this */
+                       obj = &folder->obj;
+                       tmp = g_strdup(obj->uid);
+                       while ( obj->parent ) {
+                               obj = obj->parent;
+                               if ( obj->name != NULL ) {
+                                       oldtmp = g_strdup(tmp);
+                                       g_free(tmp);
+                                       tmp = g_strdup_printf("%s/%s", obj->uid, oldtmp);
+                                       g_free(oldtmp);
+                               }
+                       }
+                       path = g_strdup_printf("%s/%s", book->fileName, tmp);
+                       g_free(tmp);
+               } else {
+                       path = g_strdup_printf("%s", book->fileName);
+               }
+               debug_print( "addressbook_foldersel: %s\n", path?path:"(null)");
+               return path;
+       }
+       return NULL;
+}
+
+/* ***********************************************************************
+ * Book/folder checking.
+ * ***********************************************************************
+ */
+
+static FolderInfo *addressbook_peek_subfolder_exists_create_folderinfo( AddressBookFile *abf, ItemFolder *folder )
+{
+       FolderInfo *fi = g_new0( FolderInfo, 1 );
+       fi->book   = abf;
+       fi->folder = folder;
+       return fi;
+}
+
+static void addressbook_peek_subfolder_exists_load_folder( ItemFolder *parentFolder,
+                                       FolderInfo *fiParent, FolderPathMatch *match )
+{
+       GList *list;
+       ItemFolder *folder;
+       gchar *fName;
+       FolderInfo *fi;
+       FolderPathMatch *nextmatch = NULL;
+
+       if (!parentFolder)
+               return;
+
+       list = parentFolder->listFolder;
+       while ( list ) {
+               folder = list->data;
+               fName = g_strdup( ADDRITEM_NAME(folder) );
+
+               /* match folder name, match pointer will be set to NULL if next recursive call
+                  doesn't need to match subfolder name */
+               if ( match != NULL &&
+                        match->matched == FALSE ) {
+                       if ( strcmp(match->folder_path[match->index], folder->obj.uid) == 0 ) {
+                               /* folder name matches, prepare next subfolder match */
+                               debug_print("matched folder name '%s'\n", fName);
+                               match->index++;
+                               if ( match->folder_path[match->index] == NULL ) {
+                                       /* we've matched all elements */
+                                       match->matched = TRUE;
+                                       match->folder = folder;
+                                       debug_print("book/folder path matched!\n");
+                               } else {
+                                       /* keep on matching */
+                                       nextmatch = match;
+                               }
+                       }
+               }
+
+               g_free( fName );
+
+               fi = addressbook_peek_subfolder_exists_create_folderinfo( fiParent->book, folder );
+               addressbook_peek_subfolder_exists_load_folder( folder, fi, nextmatch );
+               g_free(fi);
+               list = g_list_next( list );
+       }
+}
+
+/*
+ * This function is used by to check if a matcher book/folder path corresponds to an
+   existing addressbook book/folder ("" or "Any" are considered as valid, NULL invalid).
+   Caution: returned book and folder pointers can be NULL even when returning TRUE:
+   if book AND folder are NULL this means that folderpath was empty or Any.
+   If folderpath is a simple book name (without folder), book will not be NULL and folder
+   will be NULL. It's not expected to return book as NULL and folder as non NULL.
+ */
+
+gboolean addressbook_peek_folder_exists( gchar *folderpath,
+                                                                                AddressDataSource **book,
+                                                                                ItemFolder **folder )
+{
+       AddressDataSource *ds;
+       GList *list, *nodeDS;
+       ItemFolder *rootFolder;
+       AddressBookFile *abf;
+       FolderInfo *fi;
+       FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL, NULL };
+
+       if ( book )
+               *book = NULL;
+       if ( folder )
+               *folder = NULL;
+
+       if ( folderpath == NULL )
+               return FALSE;
+
+       if ( strcasecmp(folderpath, _("Any")) == 0 || *folderpath == '\0' )
+               return TRUE;
+
+       /* split the folder path we've received, we'll try to match this path, subpath by
+          subpath against the book/folder structure in order */
+       folder_path_match.folder_path = g_strsplit( folderpath, "/", 256 );
+       if (!folder_path_match.folder_path)
+               return FALSE;
+
+       list = addrindex_get_interface_list( _addressIndex_ );
+       while ( list && !folder_path_match.matched ) {
+               AddressInterface *interface = list->data;
+               if ( interface && interface->type == ADDR_IF_BOOK ) {
+                       nodeDS = interface->listSource;
+                       while ( nodeDS && !folder_path_match.matched ) {
+                               ds = nodeDS->data;
+
+                               /* Read address book */
+                               if( ! addrindex_ds_get_read_flag( ds ) ) {
+                                       addrindex_ds_read_data( ds );
+                               }
+
+                               /* Add node for address book */
+                               abf = ds->rawDataSource;
+
+                               /* match book name */
+                               if ( abf && abf->fileName &&
+                                   strcmp(folder_path_match.folder_path[0], abf->fileName) == 0 ) {
+
+                                       debug_print("matched book name '%s'\n", abf->fileName);
+                                       folder_path_match.book = ds;
+
+                                       if ( folder_path_match.folder_path[1] == NULL ) {
+                                               /* no folder part to match */
+
+                                               folder_path_match.matched = TRUE;
+                                               folder_path_match.folder = NULL;
+                                               debug_print("book path matched!\n");
+
+                                       } else {
+                                               /* match folder part */
+
+                                               fi = addressbook_peek_subfolder_exists_create_folderinfo( abf, NULL );
+                                               rootFolder = addrindex_ds_get_root_folder( ds );
+
+                                               /* prepare for recursive call */
+                                               folder_path_match.index = 1;
+                                               /* this call will set folder_path_match.matched and folder_path_match.folder */
+                                               addressbook_peek_subfolder_exists_load_folder( rootFolder, fi, &folder_path_match );
+                                               g_free(fi);
+                                       }
+                               }
+
+                               nodeDS = g_list_next( nodeDS );
+                       }
+               }
+               list = g_list_next( list );
+       }
+
+       g_strfreev( folder_path_match.folder_path );
+
+       if ( book )
+               *book = folder_path_match.book;
+       if ( folder )
+               *folder = folder_path_match.folder;
+       return folder_path_match.matched;
+}
+
+
 /* **********************************************************************
  * Address Import.
  * ***********************************************************************
@@ -4672,6 +5380,16 @@ static void addressbook_export_ldif_cb( void ) {
        addressbook_exp_ldif( cache );
 }
 
+static void addressbook_find_duplicates_cb(void)
+{
+       addrduplicates_find(GTK_WINDOW(addrbook.window));       
+}
+
+static void addressbook_edit_custom_attr_cb(void)
+{
+       addressbook_custom_attr_edit();
+}
+               
 static void addressbook_start_drag(GtkWidget *widget, gint button, 
                                   GdkEvent *event,
                                   void *data)
@@ -4729,11 +5447,11 @@ static void addressbook_drag_data_get(GtkWidget        *widget,
                if( ds && ds->interface && ds->interface->readOnly)
                        gtk_selection_data_set(selection_data,
                                       selection_data->target, 8,
-                                      "Dummy_addr_copy", 15);
+                                      (const guchar *)"Dummy_addr_copy", 15);
                else
                        gtk_selection_data_set(selection_data,
                                       selection_data->target, 8,
-                                      "Dummy_addr_move", 15);
+                                      (const guchar *)"Dummy_addr_move", 15);
        } 
 }
 
@@ -4756,12 +5474,14 @@ static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
 
-               if (y > height - 24 && height + vpos < total_height)
+               if (y > height - 24 && height + vpos < total_height) {
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
-               if (y < 24 && y > 0)
+                       gtk_adjustment_changed(pos);
+               }
+               if (y < 24 && y > 0) {
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
-
+                       gtk_adjustment_changed(pos);
+               }
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
 
                if (node != NULL) {
@@ -4796,7 +5516,6 @@ static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
        } else {
                gdk_drag_status(context, 0, time);
        }
-
        return acceptable;
 }
 
@@ -4857,4 +5576,3 @@ static void addressbook_drag_received_cb(GtkWidget        *widget,
 /*
 * End of Source.
 */
-