Index: schemas/desktop_gnome_applications_office.schemas.in
===================================================================
--- schemas/desktop_gnome_applications_office.schemas.in	(revision 3620)
+++ schemas/desktop_gnome_applications_office.schemas.in	(working copy)
@@ -6,7 +6,7 @@
       <applyto>/desktop/gnome/applications/calendar/exec</applyto>
       <owner>gnome</owner>
       <type>string</type>
-      <default>evolution</default>
+      <default>evolution --component=calendar</default>
       <locale name="C">
         <short>Default calendar</short>
         <long>Default calendar application</long>
@@ -29,7 +29,7 @@
       <applyto>/desktop/gnome/applications/tasks/exec</applyto>
       <owner>gnome</owner>
       <type>string</type>
-      <default>evolution</default>
+      <default>evolution --component=tasks</default>
       <locale name="C">
         <short>Default tasks</short>
         <long>Default tasks application</long>
