Index: libedataserverui/e-name-selector-dialog.c
===================================================================
--- libedataserverui/e-name-selector-dialog.c	(revision 8256)
+++ libedataserverui/e-name-selector-dialog.c	(working copy)
@@ -550,7 +550,7 @@
 	gtk_widget_show (GTK_WIDGET(hbox));
 	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET(hbox));

-	label = gtk_label_new_with_mnemonic (_("_Add"));
+	label = gtk_label_new ("Add");
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);

@@ -575,7 +575,7 @@
 	gtk_widget_show (image);
 	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);

-	label = gtk_label_new_with_mnemonic (_("_Remove"));
+	label = gtk_label_new ("Remove");
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);

Index: libedataserverui/ChangeLog
===================================================================
--- libedataserverui/ChangeLog	(revision 8256)
+++ libedataserverui/ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2007-12-02  Alex Kloss  <alexkloss@att.net>
+
+	** Fix for bug #322917
+
+	* e-name-selector-dialog.c: (e_name_selector_dialog_init):
+	Remove mnemonics for Add, Remove buttons to avoid conflicts
+	* e-name-selector-dialog.glade:
+	Change mnemonics for Contacts, Address Book labels
+	Add mnemonic for Category label
+
 2007-11-26  Milan Crha  <mcrha@redhat.com>

 	** Fix for bug #308815
Index: libedataserverui/e-name-selector-dialog.glade
===================================================================
--- libedataserverui/e-name-selector-dialog.glade	(revision 8256)
+++ libedataserverui/e-name-selector-dialog.glade	(working copy)
@@ -83,7 +83,7 @@
 	      <child>
 		<widget class="GtkLabel" id="AddressBookLabel">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Address _Book:</property>
+		  <property name="label" translatable="yes">Address B_ook:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -122,6 +122,7 @@
 		  <property name="width_chars">-1</property>
 		  <property name="single_line_mode">False</property>
 		  <property name="angle">0</property>
+		  <property name="mnemonic_widget">combobox-category</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -272,7 +273,7 @@
       <child>
 	<widget class="GtkLabel" id="label36">
 	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;b&gt;_Contacts&lt;/b&gt;</property>
+	  <property name="label" translatable="yes">&lt;b&gt;Co_ntacts&lt;/b&gt;</property>
 	  <property name="use_underline">True</property>
 	  <property name="use_markup">True</property>
 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
