diff --git a/evolution.spec b/evolution.spec
index efaf656..3480978 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -378,14 +378,14 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null
-#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
-#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null
-#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
 %post bogofilter
@@ -408,13 +408,13 @@ rm -rf $RPM_BUILD_ROOT
 # GConf schemas:
 %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
-#%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
+%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
-#%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
-#%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 # The main executable
@@ -462,8 +462,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.*
 #%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.*
-#%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
-#%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-mail.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.*
 #%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.*
 %{_libdir}/evolution/%{evo_major}/libfilter.so.*
@@ -513,14 +513,14 @@ rm -rf $RPM_BUILD_ROOT
 #%{evo_plugin_dir}/org-gnome-calendar-weather.eplug
 #%{evo_plugin_dir}/liborg-gnome-calendar-weather.so
 
-#%{evo_plugin_dir}/org-gnome-default-mailer.eplug
-#%{evo_plugin_dir}/liborg-gnome-default-mailer.so
+%{evo_plugin_dir}/org-gnome-default-mailer.eplug
+%{evo_plugin_dir}/liborg-gnome-default-mailer.so
 
 %{evo_plugin_dir}/org-gnome-default-source.eplug
 %{evo_plugin_dir}/liborg-gnome-default-source.so
 
-#%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
-#%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
+%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
+%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
 
 %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
@@ -534,8 +534,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-profiler.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-profiler.so
 
-#%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
-#%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
+%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
 
 #%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
 #%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
@@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-external-editor.eplug
 %{evo_plugin_dir}/liborg-gnome-external-editor.so
 
+%{evo_plugin_dir}/org-gnome-face.eplug
+%{evo_plugin_dir}/liborg-gnome-face.so
+
 #%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
 #%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
 #%{evo_plugin_dir}/org-gnome-compose-send-options.xml
@@ -568,9 +571,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-mail-notification.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-notification.so
 
-#%{evo_plugin_dir}/org-gnome-mail-to-task.eplug
-#%{evo_plugin_dir}/liborg-gnome-mail-to-task.so
-#%{evo_plugin_dir}/org-gnome-mail-to-task.xml
+%{evo_plugin_dir}/org-gnome-mail-to-task.eplug
+%{evo_plugin_dir}/liborg-gnome-mail-to-task.so
 
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
@@ -578,8 +580,8 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-plugin-manager.eplug
 %{evo_plugin_dir}/liborg-gnome-plugin-manager.so
 
-#%{evo_plugin_dir}/org-gnome-prefer-plain.eplug
-#%{evo_plugin_dir}/liborg-gnome-prefer-plain.so
+%{evo_plugin_dir}/org-gnome-prefer-plain.eplug
+%{evo_plugin_dir}/liborg-gnome-prefer-plain.so
 
 #%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
 #%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
@@ -591,9 +593,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-subject-thread.eplug
 %{evo_plugin_dir}/liborg-gnome-subject-thread.so
 
-#%{evo_plugin_dir}/templates.glade
-#%{evo_plugin_dir}/org-gnome-templates.eplug
-#%{evo_plugin_dir}/liborg-gnome-templates.so
+%{evo_plugin_dir}/templates.glade
+%{evo_plugin_dir}/org-gnome-templates.eplug
+%{evo_plugin_dir}/liborg-gnome-templates.so
 
 %{evo_plugin_dir}/org-gnome-vcard-inline.eplug
 %{evo_plugin_dir}/liborg-gnome-vcard-inline.so
@@ -624,8 +626,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
 #%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
-#%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-mail.so
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so
 #%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so
 %{_libdir}/evolution/%{evo_major}/libfilter.so