Index: evolution-2.11.6.1/calendar/conduits/memo/memo-conduit.c
===================================================================
--- evolution-2.11.6.1.orig/calendar/conduits/memo/memo-conduit.c
+++ evolution-2.11.6.1/calendar/conduits/memo/memo-conduit.c
@@ -471,6 +471,8 @@ local_record_to_pilot_record (EMemoLocal
 	pi_buffer_t * buffer;
 #endif
 
+	memset(&p, 0, sizeof (p));
+
 	g_assert (local->comp != NULL);
 	g_assert (local->memo != NULL );
 	
Index: evolution-2.11.6.1/calendar/conduits/todo/todo-conduit.c
===================================================================
--- evolution-2.11.6.1.orig/calendar/conduits/todo/todo-conduit.c
+++ evolution-2.11.6.1/calendar/conduits/todo/todo-conduit.c
@@ -618,6 +618,8 @@ local_record_to_pilot_record (EToDoLocal
 	
 	LOG (g_message ( "local_record_to_pilot_record\n" ));
 
+	memset(&p, 0, sizeof (p));
+
 	p.ID = local->local.ID;
 	p.category = local->local.category;
 	p.attr = local->local.attr;
Index: evolution-2.11.6.1/addressbook/conduit/address-conduit.c
===================================================================
--- evolution-2.11.6.1.orig/addressbook/conduit/address-conduit.c
+++ evolution-2.11.6.1/addressbook/conduit/address-conduit.c
@@ -810,6 +810,8 @@ local_record_to_pilot_record (EAddrLocal
 #ifdef PILOT_LINK_0_12
 	pi_buffer_t * buffer;
 #endif
+
+	memset(&p, 0, sizeof (p));
 	
 	g_assert (local->addr != NULL );
 	
Index: evolution-2.11.6.1/calendar/conduits/calendar/calendar-conduit.c
===================================================================
--- evolution-2.11.6.1.orig/calendar/conduits/calendar/calendar-conduit.c
+++ evolution-2.11.6.1/calendar/conduits/calendar/calendar-conduit.c
@@ -838,6 +838,8 @@ local_record_to_pilot_record (ECalLocalR
 	pi_buffer_t * buffer;
 #endif
 
+	memset(&p, 0, sizeof (p));
+
 	g_assert (local->comp != NULL);
 	g_assert (local->appt != NULL );
 	
Index: evolution-2.11.6.1/addressbook/gui/merging/eab-contact-merging.c
===================================================================
--- evolution-2.11.6.1.orig/addressbook/gui/merging/eab-contact-merging.c
+++ evolution-2.11.6.1/addressbook/gui/merging/eab-contact-merging.c
@@ -343,6 +343,7 @@ mergeit (EContactMergingLookup *lookup)
 		     value = 1;
 		     break;
 	case GTK_RESPONSE_CANCEL:
+	default:
 	             value = 0;
 		     break;  
 	}
Index: evolution-2.11.6.1/plugins/exchange-operations/exchange-delegates-user.c
===================================================================
--- evolution-2.11.6.1.orig/plugins/exchange-operations/exchange-delegates-user.c
+++ evolution-2.11.6.1/plugins/exchange-operations/exchange-delegates-user.c
@@ -30,8 +30,11 @@
 #include <mail/mail-component.h>
 #include <mail/mail-send-recv.h>
 #include <camel/camel-multipart.h>
+#include <camel/camel-mime-utils.h>
 #include <camel/camel-stream-mem.h>
 #include <exchange-account.h>
+#include "exchange-delegates.h"
+#include <exchange/exchange-account.h>
 #include <e2k-global-catalog.h>
 #include <e2k-marshal.h>
 #include <e2k-sid.h>
@@ -51,6 +54,8 @@
 #undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtkoptionmenu.h>
 
+#include <glib.h>
+
 #include <string.h>