=== modified file 'calendar/gui/calendar-component.c'
Index: calendar/gui/calendar-component.c
===================================================================
--- calendar/gui/calendar-component.c.orig
+++ calendar/gui/calendar-component.c
@@ -1284,7 +1284,7 @@ create_new_event (CalendarComponent *cal
 	} else {
 		ECalComponent *comp;
 		EventEditor *editor;
-		CompEditorFlags flags;
+		CompEditorFlags flags = 0; 
 
 		flags = COMP_EDITOR_USER_ORG | COMP_EDITOR_NEW_ITEM;
 		if (is_meeting)
Index: mail/em-composer-prefs.c
===================================================================
--- mail/em-composer-prefs.c.orig
+++ mail/em-composer-prefs.c
@@ -56,6 +56,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkimage.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkentry.h>
 #include <gtk/gtkcolorbutton.h>
 #include <gtk/gtkfilechooserbutton.h>
 
Index: mail/em-composer-utils.c
===================================================================
--- mail/em-composer-utils.c.orig
+++ mail/em-composer-utils.c
@@ -55,6 +55,7 @@
 #include <camel/camel-stream-mem.h>
 #include <camel/camel-nntp-address.h>
 #include <camel/camel-vee-folder.h>
+#include <camel/camel-multipart.h>
 
 #ifdef G_OS_WIN32
 /* Undef the similar macro from pthread.h, it doesn't check if