diff --git a/e-util/e-attachment-store.c b/e-util/e-attachment-store.c
index cd8437b..f925bb4 100644
--- a/e-util/e-attachment-store.c
+++ b/e-util/e-attachment-store.c
@@ -607,11 +607,7 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store,
 	GtkWidget *extract_box_widget;
 
 	GSList *extract_group;
-	GtkWidget *extract_only, *extract_org;
-	GtkToggleButton *extract_only_toggle;
-
-	GtkWidget *extract_yes;
-	GtkToggleButton *extract_yes_toggle;
+	GtkWidget *extract_dont, *extract_only, *extract_org;
 #endif
 
 	GFile *destination;
@@ -648,28 +644,25 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store,
 	extra_box_widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	extra_box = GTK_BOX (extra_box_widget);
 
-	extract_yes = gtk_check_button_new_with_mnemonic (
-		_("E_xtract files from the attachment if it is an archive"));
-	extract_yes_toggle = GTK_TOGGLE_BUTTON (extract_yes);
-	gtk_box_pack_start (extra_box, extract_yes, FALSE, FALSE, 0);
-
 	extract_box_widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	extract_box = GTK_BOX (extract_box_widget);
 	gtk_box_pack_start (extra_box, extract_box_widget, FALSE, FALSE, 5);
 
-	extract_only = gtk_radio_button_new_with_mnemonic (NULL,
+	extract_dont = gtk_radio_button_new_with_mnemonic (NULL,
+		_("Do _not extract files from the attachment"));
+	gtk_box_pack_start (extract_box, extract_dont, FALSE, FALSE, 0);
+
+	extract_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (extract_dont));
+	extract_only = gtk_radio_button_new_with_mnemonic (extract_group,
 		_("Save extracted files _only"));
-	extract_only_toggle = GTK_TOGGLE_BUTTON (extract_only);
-	extract_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (extract_only));
 	gtk_box_pack_start (extract_box, extract_only, FALSE, FALSE, 0);
 
+	extract_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (extract_only));
 	extract_org = gtk_radio_button_new_with_mnemonic (extract_group,
 		_("Save extracted files and the original _archive"));
 	gtk_box_pack_start (extract_box, extract_org, FALSE, FALSE, 0);
 
-	g_object_bind_property (extract_yes, "active", extract_box, "visible", 0);
-	gtk_toggle_button_set_active (extract_yes_toggle, TRUE);
-	gtk_toggle_button_set_active (extract_only_toggle, TRUE);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (extract_dont), TRUE);
 
 	gtk_widget_show_all (extra_box_widget);
 	gtk_file_chooser_set_extra_widget (file_chooser, extra_box_widget);
@@ -702,9 +695,9 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store,
 		mime_type = e_attachment_dup_mime_type (attachment);
 		settings = g_settings_new (AUTOAR_PREF_DEFAULT_GSCHEMA_ID);
 		arpref = autoar_pref_new_with_gsettings (settings);
-		if (!autoar_pref_check_file_name (arpref, name) &&
-		    !autoar_pref_check_mime_type_d (arpref, mime_type)) {
-			gtk_toggle_button_set_active (extract_yes_toggle, FALSE);
+		if (autoar_pref_check_file_name (arpref, name) ||
+		    autoar_pref_check_mime_type_d (arpref, mime_type)) {
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (extract_only), TRUE);
 		}
 
 		g_clear_object (&settings);
@@ -725,9 +718,12 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store,
 		destination = gtk_file_chooser_get_file (file_chooser);
 
 #ifdef HAVE_AUTOAR
-		save_self = !gtk_toggle_button_get_active (extract_yes_toggle) ||
-			    !gtk_toggle_button_get_active (extract_only_toggle);
-		save_extracted = gtk_toggle_button_get_active (extract_yes_toggle);
+		save_self =
+			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (extract_dont)) ||
+			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (extract_org));
+		save_extracted =
+			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (extract_only)) ||
+			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (extract_org));
 
 		if (action == GTK_FILE_CHOOSER_ACTION_SAVE) {
 			e_attachment_set_save_self (attachment_list->data, save_self);
