[evolution-mapi/gnome-2-32] Unable to send mail after fix for bug #608388

[Milan Crha <mcrha src gnome org>]

commit e79ad4aa8b4ccddb5ab287e815d5e135841dc218
Author: Milan Crha <mcrha redhat com>
Date:   Tue Oct 19 12:33:25 2010 +0200

    Unable to send mail after fix for bug #608388

 src/camel/camel-mapi-transport.c               |    8 ++++++++
 src/libexchangemapi/exchange-mapi-connection.c |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index adb794d..5a51268 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -63,7 +63,15 @@ mapi_message_item_send (ExchangeMapiConnection *conn, MailItem *item, GError **p
 	guint64 fid = 0;
 	mapi_id_t mid = 0;
 
+	#define unset(x) g_free (x); x = NULL
+
 	item->header.flags = MSGFLAG_UNSENT;
+	unset (item->header.from);
+	unset (item->header.from_email);
+	unset (item->header.transport_headers);
+	item->header.recieved_time = 0;
+
+	#undef unset
 
 	mid = exchange_mapi_connection_create_item (conn, olFolderSentMail, fid,
 					 camel_mapi_utils_create_item_build_props, item,
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index 748acab..9664f34 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -1375,7 +1375,7 @@ exchange_mapi_util_modify_recipients (ExchangeMapiConnection *conn, TALLOC_CTX *
 	/* Modify the recipient table */
 	ms = ModifyRecipients (obj_message, SRowSet);
 	if (ms != MAPI_E_SUCCESS) {
-		make_mapi_error (perror, "ModifyRecpients", ms);
+		make_mapi_error (perror, "ModifyRecipients", ms);
 		goto cleanup;
 	}