X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=8c65b6c815eb63c476560060b83e4bcd2e696892;hp=7d2670585cae363eced1252c686332f3cf299a71;hb=c5b4509941133fe5565226871287fbbe8d771d2c;hpb=4a7f21fbd3ff15e771da0deaa5144a987369ad8b

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7d26705..8c65b6c 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -686,9 +686,10 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win)
 {
-       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
-
-       modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+	if (MODEST_IS_MSG_VIEW_WINDOW (win))
+		modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+	else if (MODEST_IS_MSG_EDIT_WINDOW (win))
+		modest_msg_edit_window_add_to_contacts (MODEST_MSG_EDIT_WINDOW (win));
 }
 
 void
@@ -1003,9 +1004,14 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 				if (protocol) {
 					if (tny_account_get_connection_status (account) ==
 					    TNY_CONNECTION_STATUS_CONNECTED) {
-						format = modest_protocol_get_translation (protocol,
-											  MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE,
-											  subject);
+						if (header) {
+							format = modest_protocol_get_translation (protocol,
+												  MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE,
+												  subject);
+						} else {
+							format = modest_protocol_get_translation (protocol,
+												  MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE_LOST_HEADER);
+						}
 					} else {
 						format = g_strdup_printf (_("mail_ib_backend_server_invalid"),
 									  tny_account_get_hostname (account));