X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=7a5d0f55f4b5834beb50fedc228af870ab55e91d;hp=4074def8a0048b335c2b18d1fdb4de8d95a83766;hb=6aa065e1ca72b0f503eda2560453dfdd2bed9e4e;hpb=d4590c031485873aef5bae596535e238c2dcac0e

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 4074def..7a5d0f5 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -3403,24 +3403,27 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to
 
 	/* Check names */
 	g_object_ref (window);
-	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),  &address_list)) {
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field),
+					      (add_to_addressbook) ? &address_list : NULL)) {
 		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
 		g_object_unref (window);
 		return FALSE;
 	}
-	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),  &address_list)) {
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field),
+					      (add_to_addressbook) ? &address_list : NULL)) {
 		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
 		g_object_unref (window);
 		return FALSE;
 	}
-	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), &address_list)) {
+	if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field),
+					      (add_to_addressbook) ? &address_list : NULL)) {
 		modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
 		g_object_unref (window);
 		return FALSE;
 	}
 
 	/* Add contacts to address book */
-	if (address_list)
+	if (add_to_addressbook && address_list)
 		modest_address_book_add_address_list (address_list);
 
 	if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&