Index: src/libexchangemapi/exchange-mapi-cal-utils.c
===================================================================
--- src/libexchangemapi/exchange-mapi-cal-utils.c	(revision 20)
+++ src/libexchangemapi/exchange-mapi-cal-utils.c	(working copy)
@@ -1312,7 +1312,7 @@
 	if (comp)
 		icalcomponent_add_component (icalcomp, 
 			icalcomponent_new_clone(e_cal_component_get_icalcomponent(comp)));
-	str = icalcomponent_as_ical_string (icalcomp);
+	str = icalcomponent_as_ical_string_r (icalcomp);
 	icalcomponent_free (icalcomp);
 	if (comp)
 		g_object_unref (comp);
Index: src/libexchangemapi/exchange-mapi-cal-recur-utils.c
===================================================================
--- src/libexchangemapi/exchange-mapi-cal-recur-utils.c	(revision 20)
+++ src/libexchangemapi/exchange-mapi-cal-recur-utils.c	(working copy)
@@ -1070,7 +1070,7 @@
 			flag32 = 0x5AE980DF; 
 		else if (end_type == END_AFTER_N_OCCURRENCES) {
 			ECalComponentDateTime dtstart; 
-			gchar *rrule_str = icalrecurrencetype_as_string (rt); 
+			gchar *rrule_str = icalrecurrencetype_as_string_r (rt); 
 			time_t *array = g_new0 (time_t, rt->count); 
 
 			e_cal_component_get_dtstart (comp, &dtstart);
Index: src/calendar/e-cal-backend-mapi.c
===================================================================
--- src/calendar/e-cal-backend-mapi.c	(revision 20)
+++ src/calendar/e-cal-backend-mapi.c	(working copy)
@@ -1659,7 +1659,7 @@
 			/*remove a single instance of a recurring event and modify */
 			time_rid = icaltime_from_string (rid);
 			e_cal_util_remove_instances (icalcomp, time_rid, mod);
-			new_calobj  = (char *) icalcomponent_as_ical_string (icalcomp);
+			new_calobj  = (char *) icalcomponent_as_ical_string_r (icalcomp);
 			status = e_cal_backend_mapi_modify_object (backend, cal, new_calobj, CALOBJ_MOD_ALL, &obj, &new_object);
 			if (status == GNOME_Evolution_Calendar_Success) {
 				*old_object = obj;
@@ -1891,7 +1891,7 @@
 					icalcomponent_set_method (resp_comp, ICAL_METHOD_RESPONSE);
 					icalcomponent_add_component (resp_comp, 
 						icalcomponent_new_clone(e_cal_component_get_icalcomponent(comp)));
-					comp_str = icalcomponent_as_ical_string (resp_comp);
+					comp_str = icalcomponent_as_ical_string_r (resp_comp);
 					status = e_cal_backend_mapi_send_objects (backend, cal, comp_str, &users, &new_object);
 					g_free (comp_str);
 					g_free (new_object);
@@ -1957,7 +1957,7 @@
 	if (!icalcomp)
 		return GNOME_Evolution_Calendar_InvalidObject;
 
-	*object = icalcomponent_as_ical_string (icalcomp);
+	*object = icalcomponent_as_ical_string_r (icalcomp);
 
 	return GNOME_Evolution_Calendar_Success;
 }
