diff --git a/ChangeLog b/ChangeLog
index b40c7e7e2a..04a0040100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,22 @@
+2005-05-26  Sven Neumann  <sven@gimp.org>
+
+	* app/dialogs/channel-options-dialog.c: fixed capitalization,
+	removed trailing whitespace.
+
+	* app/actions/channels-commands.c (channels_new_channel_response):
+	also set the channel color if creating the channel by duplicating
+	the selection.
+
+	* app/actions/channels-commands.c
+	* app/actions/qmask-commands.c: added mnemonics.
+
 2005-05-26  Nathan Summers  <rock@gimp.org>
 
 	* app/dialogs/channel-options-dialog.[ch]: added an "initialize from
-	selection" option to the new channel dialog
+	selection" option to the new channel dialog.
 
 	* app/actions/channels-commands.c
-	* app/actions/qmask-commands.c: modified accordingly
+	* app/actions/qmask-commands.c: modified accordingly.
 
 2005-05-26  Sven Neumann  <sven@gimp.org>
 
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index 5b49514953..24ce5f25b5 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -89,7 +89,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
                                         _("Edit Channel Attributes"),
                                         GIMP_HELP_CHANNEL_EDIT,
                                         _("Edit Channel Color"),
-                                        _("Fill Opacity:"),
+                                        _("_Fill Opacity:"),
 					FALSE);
 
   g_signal_connect (options->dialog, "response",
@@ -122,7 +122,7 @@ channels_new_cmd_callback (GtkAction *action,
                                         _("New Channel Options"),
                                         GIMP_HELP_CHANNEL_NEW,
                                         _("New Channel Color"),
-                                        _("Fill Opacity:"),
+                                        _("_Fill Opacity:"),
 					TRUE);
 
   g_signal_connect (options->dialog, "response",
@@ -337,15 +337,15 @@ channels_new_channel_response (GtkWidget            *widget,
 
       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (options->save_sel_checkbutton)))
 	{
-	  GimpChannel *selection;
+	  GimpChannel *selection = gimp_image_get_mask (options->gimage);
 
-	  selection = gimp_image_get_mask(options->gimage);
-	  
-	  new_channel = GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection),
-                                      GIMP_TYPE_CHANNEL,
-                                      FALSE));
+	  new_channel =
+            GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection),
+                                               GIMP_TYPE_CHANNEL,
+                                               FALSE));
 
 	  gimp_object_set_name (GIMP_OBJECT (new_channel), channel_name);
+          gimp_channel_set_color (new_channel, &channel_color, FALSE);
 	}
       else
         {
@@ -354,7 +354,7 @@ channels_new_channel_response (GtkWidget            *widget,
                                           options->gimage->height,
                                           channel_name,
                                           &channel_color);
-	
+
           gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
                                       options->context,
                                       GIMP_TRANSPARENT_FILL);
diff --git a/app/actions/qmask-commands.c b/app/actions/qmask-commands.c
index 531dbae1e4..39dca7bfc3 100644
--- a/app/actions/qmask-commands.c
+++ b/app/actions/qmask-commands.c
@@ -109,7 +109,7 @@ qmask_configure_cmd_callback (GtkAction *action,
                                         _("Edit Quick Mask Attributes"),
                                         GIMP_HELP_QMASK_EDIT,
                                         _("Edit Quick Mask Color"),
-                                        _("Mask Opacity:"),
+                                        _("_Mask Opacity:"),
 					FALSE);
 
   g_signal_connect (options->dialog, "response",
diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c
index 531dbae1e4..39dca7bfc3 100644
--- a/app/actions/quick-mask-commands.c
+++ b/app/actions/quick-mask-commands.c
@@ -109,7 +109,7 @@ qmask_configure_cmd_callback (GtkAction *action,
                                         _("Edit Quick Mask Attributes"),
                                         GIMP_HELP_QMASK_EDIT,
                                         _("Edit Quick Mask Color"),
-                                        _("Mask Opacity:"),
+                                        _("_Mask Opacity:"),
 					FALSE);
 
   g_signal_connect (options->dialog, "response",
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 35f7274808..07fde40a21 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -141,13 +141,14 @@ channel_options_dialog_new (GimpImage     *gimage,
       options->name_entry = gtk_entry_new ();
       gtk_entry_set_activates_default (GTK_ENTRY (options->name_entry), TRUE);
       gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
-                                 _("Channel Name:"), 0.0, 0.5,
+                                 _("Channel _Name:"), 0.0, 0.5,
                                  options->name_entry, 2, FALSE);
 
       gtk_entry_set_text (GTK_ENTRY (options->name_entry), channel_name);
     }
 
-  opacity_adj = gimp_scale_entry_new (GTK_TABLE (table), 0, channel_name ? 1 : 0,
+  opacity_adj = gimp_scale_entry_new (GTK_TABLE (table),
+                                      0, channel_name ? 1 : 0,
                                       opacity_label, 100, -1,
                                       channel_color->a * 100.0,
                                       0.0, 100.0, 1.0, 10.0, 1,
@@ -168,14 +169,14 @@ channel_options_dialog_new (GimpImage     *gimage,
 
   if (show_from_sel)
     {
-      options->save_sel_checkbutton = gtk_check_button_new_with_mnemonic (_("_Initialize From Selection"));
+      options->save_sel_checkbutton =
+        gtk_check_button_new_with_mnemonic (_("Initialize from _selection"));
 
-      gtk_box_pack_start (GTK_BOX (vbox), options->save_sel_checkbutton, 
+      gtk_box_pack_start (GTK_BOX (vbox), options->save_sel_checkbutton,
 		          FALSE, FALSE, 0);
       gtk_widget_show (options->save_sel_checkbutton);
     }
-  else
-    options->save_sel_checkbutton = NULL;
+
   return options;
 }