Radically reorganize source code.

- Collect all shell modules into a new top-level 'modules' directory:

      $(top_srcdir)/modules/addressbook
      $(top_srcdir)/modules/calendar
      $(top_srcdir)/modules/mail

  Nothing is allowed to link to these, not plugins nor other modules.

  THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X.

- Mimic the libevolution-mail-shared library from master (except drop
  the "shared" suffix) and have libevolution-mail-importers and all
  mail-related plugins link to it.

- Discard the a11y subdirectories and have the files live alongside
  their counterpart widgets.

237 files changed, 798 insertions, 806 deletions

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index d3c5b40a94..0000000000
--- a/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 12e626866d..d7c022c4ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,29 +35,6 @@ if ENABLE_SMIME
 SMIME_DIR=smime
 endif
 
-# Disabled component and plugin directories during shell rewrite.
-
-#SUBDIRS = 			\
-#	win32			\
-#	data                    \
-#	e-util                  \
-#	a11y			\
-#	widgets                 \
-#	shell                   \
-#	filter			\
-#	$(SMIME_DIR)		\
-#	addressbook		\
-#	calendar		\
-#	art                     \
-#	composer		\
-#	mail			\
-#	plugins			\
-#	ui			\
-#	views			\
-#	tools			\
-#	po			\
-#	sounds
-
 SUBDIRS = 			\
 	win32			\
 	data			\
@@ -74,6 +51,7 @@ SUBDIRS = 			\
 	calendar		\
 	art			\
 	plugins			\
+	modules			\
 	doc			\
 	ui			\
 	views			\
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
index 73c12f9bf2..7f08bf425d 100644
--- a/addressbook/gui/Makefile.am
+++ b/addressbook/gui/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = merging widgets contact-editor contact-list-editor component
+SUBDIRS = merging widgets contact-editor contact-list-editor
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 45c0b0cba3..e940065833 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -52,14 +52,14 @@ libeabwidgets_la_SOURCES =			\
 	gal-view-minicard.h			\
 	gal-view-factory-minicard.c		\
 	gal-view-factory-minicard.h		\
-	a11y/ea-minicard.c			\
-	a11y/ea-minicard.h			\
-	a11y/ea-minicard-view.c			\
-	a11y/ea-minicard-view.h			\
-	a11y/ea-addressbook-view.c		\
-	a11y/ea-addressbook-view.h		\
-	a11y/ea-addressbook.c			\
-	a11y/ea-addressbook.h
+	ea-minicard.c			\
+	ea-minicard.h			\
+	ea-minicard-view.c			\
+	ea-minicard-view.h			\
+	ea-addressbook-view.c		\
+	ea-addressbook-view.h		\
+	ea-addressbook.c			\
+	ea-addressbook.h
 
 libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 5df049dbe6..ae79ead397 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -33,7 +33,7 @@
 #include <shell/e-shell-sidebar.h>
 
 #include "addressbook/printing/e-contact-print.h"
-#include "a11y/ea-addressbook.h"
+#include "ea-addressbook.h"
 
 #include "e-util/e-print.h"
 #include "e-util/e-util.h"
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index ece8d84654..6ee55f8b9f 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -34,7 +34,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include "e-util/e-util.h"
-#include "a11y/ea-addressbook.h"
+#include "ea-addressbook.h"
 
 static void e_minicard_view_drag_data_get(GtkWidget *widget,
 					  GdkDragContext *context,
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 2d9deeecbc..a8b6554888 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -38,7 +38,7 @@
 #include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
 #include <libebook/e-destination.h>
-#include "a11y/ea-addressbook.h"
+#include "ea-addressbook.h"
 
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *class);
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.c b/addressbook/gui/widgets/ea-addressbook-view.c
index b2d7ebb171..b2d7ebb171 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook-view.c
+++ b/addressbook/gui/widgets/ea-addressbook-view.c
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.h b/addressbook/gui/widgets/ea-addressbook-view.h
index 4607746337..4607746337 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook-view.h
+++ b/addressbook/gui/widgets/ea-addressbook-view.h
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook.c b/addressbook/gui/widgets/ea-addressbook.c
index 14fc4c1ca3..14fc4c1ca3 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook.c
+++ b/addressbook/gui/widgets/ea-addressbook.c
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook.h b/addressbook/gui/widgets/ea-addressbook.h
index 97b691dc18..97b691dc18 100644
--- a/addressbook/gui/widgets/a11y/ea-addressbook.h
+++ b/addressbook/gui/widgets/ea-addressbook.h
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index b35f64ae5e..b35f64ae5e 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.h b/addressbook/gui/widgets/ea-minicard-view.h
index c564dac8c8..c564dac8c8 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.h
+++ b/addressbook/gui/widgets/ea-minicard-view.h
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index b1b1ebbe33..b1b1ebbe33 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.h b/addressbook/gui/widgets/ea-minicard.h
index 879463b629..879463b629 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard.h
+++ b/addressbook/gui/widgets/ea-minicard.h
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 5da53380b8..87057a4d3a 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -4,7 +4,7 @@ else
 CONDUIT_DIR =
 endif
 
-SUBDIRS = idl common importers gui $(CONDUIT_DIR) module
+SUBDIRS = idl common importers gui $(CONDUIT_DIR)
 
 error_DATA = calendar.error
 errordir = $(privdatadir)/errors
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 0f669eee4f..b919da8cf3 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,5 +1,5 @@
 if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail-shared.la
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
 endif
 
 SUBDIRS = alarm-notify dialogs
@@ -24,7 +24,6 @@ INCLUDES =						\
 	-I$(top_srcdir)/calendar			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/a11y/calendar			\
 	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
@@ -177,30 +176,30 @@ libcal_gui_la_SOURCES =		\
 	weekday-picker.h
 
 # no gnome-cal no a11y. FIXME: KILL-BONOBO
-#	a11y/ea-calendar.c			\
-#	a11y/ea-calendar.h			\
-#	a11y/ea-calendar-helpers.c		\
-#	a11y/ea-calendar-helpers.h		\
-#	a11y/ea-cal-view.c			\
-#	a11y/ea-cal-view.h			\
-#	a11y/ea-cal-view-event.c		\
-#	a11y/ea-cal-view-event.h		\
-#	a11y/ea-day-view.c			\
-#	a11y/ea-day-view.h			\
-#	a11y/ea-day-view-main-item.c		\
-#	a11y/ea-day-view-main-item.h		\
-#	a11y/ea-day-view-cell.c			\
-#	a11y/ea-day-view-cell.h			\
-#	a11y/ea-week-view.c			\
-#	a11y/ea-week-view.h			\
-#	a11y/ea-week-view-main-item.c		\
-#	a11y/ea-week-view-main-item.h		\
-#	a11y/ea-week-view-cell.c		\
-#	a11y/ea-week-view-cell.h		\
-#	a11y/ea-jump-button.c			\
-#	a11y/ea-jump-button.h			\
-#	a11y/ea-gnome-calendar.c		\
-#	a11y/ea-gnome-calendar.h
+#	ea-calendar.c			\
+#	ea-calendar.h			\
+#	ea-calendar-helpers.c		\
+#	ea-calendar-helpers.h		\
+#	ea-cal-view.c			\
+#	ea-cal-view.h			\
+#	ea-cal-view-event.c		\
+#	ea-cal-view-event.h		\
+#	ea-day-view.c			\
+#	ea-day-view.h			\
+#	ea-day-view-main-item.c		\
+#	ea-day-view-main-item.h		\
+#	ea-day-view-cell.c			\
+#	ea-day-view-cell.h			\
+#	ea-week-view.c			\
+#	ea-week-view.h			\
+#	ea-week-view-main-item.c		\
+#	ea-week-view-main-item.h		\
+#	ea-week-view-cell.c		\
+#	ea-week-view-cell.h		\
+#	ea-jump-button.c			\
+#	ea-jump-button.h			\
+#	ea-gnome-calendar.c		\
+#	ea-gnome-calendar.h
 
 libcal_gui_la_LIBADD =					\
 	$(top_builddir)/composer/libcomposer.la				\
diff --git a/calendar/gui/a11y/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 5da164323f..5da164323f 100644
--- a/calendar/gui/a11y/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
diff --git a/calendar/gui/a11y/ea-cal-view-event.h b/calendar/gui/ea-cal-view-event.h
index 548e42b4a7..548e42b4a7 100644
--- a/calendar/gui/a11y/ea-cal-view-event.h
+++ b/calendar/gui/ea-cal-view-event.h
diff --git a/calendar/gui/a11y/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 952afcc791..952afcc791 100644
--- a/calendar/gui/a11y/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
diff --git a/calendar/gui/a11y/ea-cal-view.h b/calendar/gui/ea-cal-view.h
index 959f7816b5..959f7816b5 100644
--- a/calendar/gui/a11y/ea-cal-view.h
+++ b/calendar/gui/ea-cal-view.h
diff --git a/calendar/gui/a11y/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index f07cdfa086..f07cdfa086 100644
--- a/calendar/gui/a11y/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
diff --git a/calendar/gui/a11y/ea-calendar-helpers.h b/calendar/gui/ea-calendar-helpers.h
index a4045cd7af..a4045cd7af 100644
--- a/calendar/gui/a11y/ea-calendar-helpers.h
+++ b/calendar/gui/ea-calendar-helpers.h
diff --git a/calendar/gui/a11y/ea-calendar.c b/calendar/gui/ea-calendar.c
index d09efae4d2..d09efae4d2 100644
--- a/calendar/gui/a11y/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
diff --git a/calendar/gui/a11y/ea-calendar.h b/calendar/gui/ea-calendar.h
index b2238ffdbc..b2238ffdbc 100644
--- a/calendar/gui/a11y/ea-calendar.h
+++ b/calendar/gui/ea-calendar.h
diff --git a/calendar/gui/a11y/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index fa491e87ea..fa491e87ea 100644
--- a/calendar/gui/a11y/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
diff --git a/calendar/gui/a11y/ea-day-view-cell.h b/calendar/gui/ea-day-view-cell.h
index 669fb1abae..669fb1abae 100644
--- a/calendar/gui/a11y/ea-day-view-cell.h
+++ b/calendar/gui/ea-day-view-cell.h
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index 3bfd56f0b3..3bfd56f0b3 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
diff --git a/calendar/gui/a11y/ea-day-view-main-item.h b/calendar/gui/ea-day-view-main-item.h
index c782e6acc8..c782e6acc8 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.h
+++ b/calendar/gui/ea-day-view-main-item.h
diff --git a/calendar/gui/a11y/ea-day-view.c b/calendar/gui/ea-day-view.c
index 9eb3e343f3..9eb3e343f3 100644
--- a/calendar/gui/a11y/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
diff --git a/calendar/gui/a11y/ea-day-view.h b/calendar/gui/ea-day-view.h
index 33399f6600..33399f6600 100644
--- a/calendar/gui/a11y/ea-day-view.h
+++ b/calendar/gui/ea-day-view.h
diff --git a/calendar/gui/a11y/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index e5d9654c1a..e5d9654c1a 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
diff --git a/calendar/gui/a11y/ea-gnome-calendar.h b/calendar/gui/ea-gnome-calendar.h
index b0d2cf71d2..b0d2cf71d2 100644
--- a/calendar/gui/a11y/ea-gnome-calendar.h
+++ b/calendar/gui/ea-gnome-calendar.h
diff --git a/calendar/gui/a11y/ea-jump-button.c b/calendar/gui/ea-jump-button.c
index eb24bea42c..eb24bea42c 100644
--- a/calendar/gui/a11y/ea-jump-button.c
+++ b/calendar/gui/ea-jump-button.c
diff --git a/calendar/gui/a11y/ea-jump-button.h b/calendar/gui/ea-jump-button.h
index cd3b6e26bb..cd3b6e26bb 100644
--- a/calendar/gui/a11y/ea-jump-button.h
+++ b/calendar/gui/ea-jump-button.h
diff --git a/calendar/gui/a11y/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index e724592ec8..e724592ec8 100644
--- a/calendar/gui/a11y/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
diff --git a/calendar/gui/a11y/ea-week-view-cell.h b/calendar/gui/ea-week-view-cell.h
index 1524e9d3a8..1524e9d3a8 100644
--- a/calendar/gui/a11y/ea-week-view-cell.h
+++ b/calendar/gui/ea-week-view-cell.h
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index 74f4695a69..74f4695a69 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
diff --git a/calendar/gui/a11y/ea-week-view-main-item.h b/calendar/gui/ea-week-view-main-item.h
index d9110160c4..d9110160c4 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.h
+++ b/calendar/gui/ea-week-view-main-item.h
diff --git a/calendar/gui/a11y/ea-week-view.c b/calendar/gui/ea-week-view.c
index 97a8dae25d..97a8dae25d 100644
--- a/calendar/gui/a11y/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
diff --git a/calendar/gui/a11y/ea-week-view.h b/calendar/gui/ea-week-view.h
index bb71c17e74..bb71c17e74 100644
--- a/calendar/gui/a11y/ea-week-view.h
+++ b/calendar/gui/ea-week-view.h
diff --git a/configure.ac b/configure.ac
index bd90aee9e4..80bde6b9c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,12 @@ AM_INIT_AUTOMAKE([gnu 1.9])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(README)
 
-# Gnome Doc Initialization
+# User Documentation
 GNOME_DOC_INIT
 
+# Developer Documentation
+GTK_DOC_CHECK(1.9)
+
 # Automake 1.11 - Silent Build Rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -1787,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
 dnl Temporary KILL-BONOBO hack
-enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
+enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-source external-editor google-account-setup hula-account-setup imap-features mail-notification plugin-manager profiler sa-junk-plugin save-calendar subject-thread $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
 
 dnl PLUGINS NOT BUILDING YET
 dnl ------------------------
@@ -1803,6 +1806,7 @@ dnl ipod-sync
 dnl itip-formatter
 dnl mailing-list-actions
 dnl mail-to-task
+dnl mark-all-read
 dnl mono
 dnl prefer-plain
 dnl pst-import
@@ -1994,7 +1998,6 @@ a11y/Makefile
 addressbook/Makefile
 addressbook/conduit/Makefile
 addressbook/gui/Makefile
-addressbook/gui/component/Makefile
 addressbook/gui/contact-editor/Makefile
 addressbook/gui/contact-list-editor/Makefile
 addressbook/gui/merging/Makefile
@@ -2056,7 +2059,6 @@ calendar/conduits/memo/Makefile
 calendar/gui/Makefile
 calendar/gui/alarm-notify/Makefile
 calendar/gui/dialogs/Makefile
-calendar/module/Makefile
 composer/Makefile
 mail/Makefile
 mail/default/Makefile
@@ -2080,6 +2082,11 @@ mail/default/sr/Makefile
 mail/default/sr@latin/Makefile
 mail/default/sv/Makefile
 mail/default/hu/Makefile
+mail/importers/Makefile
+modules/Makefile
+modules/addressbook/Makefile
+modules/calendar/Makefile
+modules/mail/Makefile
 plugins/Makefile
 plugins/addressbook-file/Makefile
 plugins/attachment-reminder/Makefile
diff --git a/doc/reference/shell/tmpl/e-shell-backend.sgml b/doc/reference/shell/tmpl/e-shell-backend.sgml
new file mode 100644
index 0000000000..4d50f53e94
--- /dev/null
+++ b/doc/reference/shell/tmpl/e-shell-backend.sgml
@@ -0,0 +1,132 @@
+<!-- ##### SECTION Title ##### -->
+EShellBackend
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT EShellBackend ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL EShellBackend::activity-added ##### -->
+<para>
+
+</para>
+
+@eshellbackend: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG EShellBackend:shell ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION e_shell_backend_compare ##### -->
+<para>
+
+</para>
+
+@shell_backend_a: 
+@shell_backend_b: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_get_config_dir ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_get_data_dir ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_get_filename ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_get_shell ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_add_activity ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@activity: 
+
+
+<!-- ##### FUNCTION e_shell_backend_start ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+
+
+<!-- ##### FUNCTION e_shell_backend_is_busy ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_shutdown ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_backend_migrate ##### -->
+<para>
+
+</para>
+
+@shell_backend: 
+@major: 
+@minor: 
+@micro: 
+@error: 
+@Returns: 
+
+
diff --git a/doc/reference/shell/tmpl/e-shell-settings.sgml b/doc/reference/shell/tmpl/e-shell-settings.sgml
new file mode 100644
index 0000000000..1e1d2452e0
--- /dev/null
+++ b/doc/reference/shell/tmpl/e-shell-settings.sgml
@@ -0,0 +1,151 @@
+<!-- ##### SECTION Title ##### -->
+EShellSettings
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT EShellSettings ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION e_shell_settings_install_property ##### -->
+<para>
+
+</para>
+
+@pspec: 
+
+
+<!-- ##### FUNCTION e_shell_settings_bind_to_gconf ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@gconf_key: 
+
+
+<!-- ##### FUNCTION e_shell_settings_enable_debug ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+
+
+<!-- ##### FUNCTION e_shell_settings_get_boolean ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_settings_set_boolean ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@v_boolean: 
+
+
+<!-- ##### FUNCTION e_shell_settings_get_int ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_settings_set_int ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@v_int: 
+
+
+<!-- ##### FUNCTION e_shell_settings_get_string ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_settings_set_string ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@v_string: 
+
+
+<!-- ##### FUNCTION e_shell_settings_get_object ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_settings_set_object ##### -->
+<para>
+
+</para>
+
+@shell_settings: 
+@property_name: 
+@v_object: 
+
+
+<!-- ##### FUNCTION e_shell_settings_get_pointer ##### -->
+<para>
+
+</para>
+
+@shell_setting: 
+@property_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_settings_set_pointer ##### -->
+<para>
+
+</para>
+
+@shell_setting: 
+@property_name: 
+@v_pointer: 
+
+
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5e9a7b9781..8b7a123994 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = default
+SUBDIRS = . default importers
 
 mailincludedir = $(privincludedir)/mail
 
@@ -31,158 +31,125 @@ INCLUDES =						\
 	-DPREFIX=\""$(prefix)"\"			\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
 
-module_LTLIBRARIES =					\
-	libevolution-module-mail.la
+privsolib_LTLIBRARIES = libevolution-mail.la
 
-libevolution_module_mail_la_SOURCES =			\
-	evolution-module-mail.c				\
-	e-attachment-handler-mail.c			\
-	e-attachment-handler-mail.h			\
-	e-mail-attachment-bar.c				\
+mailinclude_HEADERS =					\
 	e-mail-attachment-bar.h				\
-	e-mail-browser.c				\
 	e-mail-browser.h				\
-	e-mail-display.c				\
 	e-mail-display.h				\
-	e-mail-label-dialog.c				\
 	e-mail-label-dialog.h				\
-	e-mail-label-list-store.c			\
 	e-mail-label-list-store.h			\
-	e-mail-label-manager.c				\
 	e-mail-label-manager.h				\
-	e-mail-label-tree-view.c			\
 	e-mail-label-tree-view.h			\
-	e-mail-local.c					\
 	e-mail-local.h					\
-	e-mail-reader.c					\
 	e-mail-reader.h					\
-	e-mail-reader-utils.c				\
 	e-mail-reader-utils.h				\
-	e-mail-search-bar.c				\
 	e-mail-search-bar.h				\
-	e-mail-shell-backend.c				\
-	e-mail-shell-backend.h				\
-	e-mail-shell-content.c				\
-	e-mail-shell-content.h				\
-	e-mail-shell-migrate.c				\
-	e-mail-shell-migrate.h				\
-	e-mail-shell-settings.c				\
-	e-mail-shell-settings.h				\
-	e-mail-shell-sidebar.c				\
-	e-mail-shell-sidebar.h				\
-	e-mail-shell-view.c				\
-	e-mail-shell-view.h				\
-	e-mail-shell-view-actions.c			\
-	e-mail-shell-view-actions.h			\
-	e-mail-shell-view-private.c			\
-	e-mail-shell-view-private.h			\
-	e-mail-store.c					\
 	e-mail-store.h					\
-	e-searching-tokenizer.c				\
 	e-searching-tokenizer.h				\
-	em-account-editor.c				\
-	em-account-editor.h				\
-	em-account-prefs.c				\
-	em-account-prefs.h				\
-	em-composer-prefs.c				\
-	em-composer-prefs.h				\
-	em-composer-utils.c				\
 	em-composer-utils.h				\
-	em-config.c					\
 	em-config.h					\
-	em-event.c					\
 	em-event.h					\
-	em-filter-context.c				\
 	em-filter-context.h				\
-	em-filter-editor.c				\
 	em-filter-editor.h				\
-	em-filter-folder-element.c			\
 	em-filter-folder-element.h			\
-	em-filter-rule.c				\
 	em-filter-rule.h				\
-	em-filter-source-element.c			\
 	em-filter-source-element.h			\
-	em-folder-properties.c				\
 	em-folder-properties.h				\
-	em-folder-selection.c				\
 	em-folder-selection.h				\
-	em-folder-selector.c				\
 	em-folder-selector.h				\
-	em-folder-selection-button.c			\
 	em-folder-selection-button.h			\
-	em-folder-tree.c				\
 	em-folder-tree.h				\
-	em-folder-tree-model.c				\
 	em-folder-tree-model.h				\
-	em-folder-utils.c				\
 	em-folder-utils.h				\
-	em-format-hook.c				\
 	em-format-hook.h				\
-	em-format-html.c				\
 	em-format-html.h				\
-	em-format-html-display.c			\
 	em-format-html-display.h			\
-	em-format-html-print.c				\
 	em-format-html-print.h				\
-	em-html-stream.c				\
 	em-html-stream.h				\
-	em-icon-stream.c				\
 	em-icon-stream.h				\
-	em-inline-filter.c				\
 	em-inline-filter.h				\
-	em-junk-hook.c					\
 	em-junk-hook.h					\
-	em-mailer-prefs.c				\
-	em-mailer-prefs.h				\
-	em-menu.c					\
 	em-menu.h					\
-	em-network-prefs.c				\
-	em-network-prefs.h				\
-	em-popup.c					\
 	em-popup.h					\
-	em-search-context.c				\
 	em-search-context.h				\
-	em-subscribe-editor.c				\
 	em-subscribe-editor.h				\
-	em-sync-stream.c				\
 	em-sync-stream.h				\
-	em-utils.c					\
 	em-utils.h					\
-	em-vfolder-context.c				\
 	em-vfolder-context.h				\
-	em-vfolder-editor.c				\
 	em-vfolder-editor.h				\
-	em-vfolder-rule.c				\
 	em-vfolder-rule.h				\
-	mail-autofilter.c				\
 	mail-autofilter.h				\
-	mail-config.c					\
 	mail-config.h					\
-	mail-folder-cache.c				\
 	mail-folder-cache.h				\
-	mail-mt.c					\
 	mail-mt.h					\
-	mail-ops.c					\
 	mail-ops.h					\
-	mail-send-recv.c				\
 	mail-send-recv.h				\
-	mail-session.c					\
 	mail-session.h					\
-	mail-tools.c					\
 	mail-tools.h					\
-	mail-vfolder.c					\
 	mail-vfolder.h					\
-	message-list.c					\
 	message-list.h					\
-	message-tag-editor.c				\
 	message-tag-editor.h				\
-	message-tag-followup.c				\
-	message-tag-followup.h				\
-	importers/mail-importer.c			\
-	importers/mail-importer.h			\
-	importers/elm-importer.c			\
-	importers/pine-importer.c			\
-	importers/evolution-mbox-importer.c
+	message-tag-followup.h
+
+libevolution_mail_la_SOURCES =				\
+	e-mail-attachment-bar.c				\
+	e-mail-browser.c				\
+	e-mail-display.c				\
+	e-mail-label-dialog.c				\
+	e-mail-label-list-store.c			\
+	e-mail-label-manager.c				\
+	e-mail-label-tree-view.c			\
+	e-mail-local.c					\
+	e-mail-reader.c					\
+	e-mail-reader-utils.c				\
+	e-mail-search-bar.c				\
+	e-mail-store.c					\
+	e-searching-tokenizer.c				\
+	em-composer-utils.c				\
+	em-config.c					\
+	em-event.c					\
+	em-filter-context.c				\
+	em-filter-editor.c				\
+	em-filter-folder-element.c			\
+	em-filter-rule.c				\
+	em-filter-source-element.c			\
+	em-folder-properties.c				\
+	em-folder-selection.c				\
+	em-folder-selector.c				\
+	em-folder-selection-button.c			\
+	em-folder-tree.c				\
+	em-folder-tree-model.c				\
+	em-folder-utils.c				\
+	em-format-hook.c				\
+	em-format-html.c				\
+	em-format-html-display.c			\
+	em-format-html-print.c				\
+	em-html-stream.c				\
+	em-icon-stream.c				\
+	em-inline-filter.c				\
+	em-junk-hook.c					\
+	em-menu.c					\
+	em-popup.c					\
+	em-search-context.c				\
+	em-subscribe-editor.c				\
+	em-sync-stream.c				\
+	em-utils.c					\
+	em-vfolder-context.c				\
+	em-vfolder-editor.c				\
+	em-vfolder-rule.c				\
+	mail-autofilter.c				\
+	mail-config.c					\
+	mail-folder-cache.c				\
+	mail-mt.c					\
+	mail-ops.c					\
+	mail-send-recv.c				\
+	mail-session.c					\
+	mail-tools.c					\
+	mail-vfolder.c					\
+	message-list.c					\
+	message-tag-editor.c				\
+	message-tag-followup.c
 
 if ENABLE_SMIME
 SMIME_LIBS =						\
@@ -190,7 +157,7 @@ SMIME_LIBS =						\
 	$(top_builddir)/smime/gui/libevolution-smime.la
 endif
 
-libevolution_module_mail_la_LIBADD =			\
+libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/composer/libcomposer.la		\
@@ -199,20 +166,10 @@ libevolution_module_mail_la_LIBADD =			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(GTKHTML_LIBS)					\
 	$(SMIME_LIBS)
 
-#libevolution_mail_la_LIBADD =					\
-#	$(top_builddir)/widgets/misc/libefilterbar.la		\
-#	$(top_builddir)/filter/libfilter.la			\
-#	$(top_builddir)/widgets/menus/libmenus.la		\
-#	$(top_builddir)/addressbook/util/libeabutil.la		\
-#	$(EVOLUTION_MAIL_LIBS)					\
-#	$(GTKHTML_LIBS)						\
-#	$(REGEX_LIBS)						\
-#	$(THREADS_LIBS)
-
-libevolution_module_mail_la_LDFLAGS = 			\
-	-avoid-version -module $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED)
 
 libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
 
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index e4013c5004..1dd3fae587 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -32,7 +32,6 @@
 #include "mail/e-mail-reader.h"
 #include "mail/e-mail-reader-utils.h"
 #include "mail/e-mail-search-bar.h"
-#include "mail/e-mail-shell-backend.h"
 #include "mail/em-folder-tree-model.h"
 #include "mail/em-format-html-display.h"
 #include "mail/message-list.h"
@@ -705,14 +704,13 @@ e_mail_browser_get_type (void)
 }
 
 GtkWidget *
-e_mail_browser_new (EMailShellBackend *mail_shell_backend)
+e_mail_browser_new (EShellBackend *shell_backend)
 {
-	g_return_val_if_fail (
-		E_IS_MAIL_SHELL_BACKEND (mail_shell_backend), NULL);
+	g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), NULL);
 
 	return g_object_new (
 		E_TYPE_MAIL_BROWSER,
-		"shell-backend", mail_shell_backend, NULL);
+		"shell-backend", shell_backend, NULL);
 }
 
 void
diff --git a/mail/e-mail-browser.h b/mail/e-mail-browser.h
index 2605b2e04c..f2fd4d9131 100644
--- a/mail/e-mail-browser.h
+++ b/mail/e-mail-browser.h
@@ -23,7 +23,7 @@
 #define E_MAIL_BROWSER_H
 
 #include <gtk/gtk.h>
-#include <mail/e-mail-shell-backend.h>
+#include <shell/e-shell-backend.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_BROWSER \
@@ -60,7 +60,7 @@ struct _EMailBrowserClass {
 };
 
 GType		e_mail_browser_get_type		(void);
-GtkWidget *	e_mail_browser_new		(EMailShellBackend *mail_shell_backend);
+GtkWidget *	e_mail_browser_new		(EShellBackend *shell_backend);
 void		e_mail_browser_close		(EMailBrowser *browser);
 gboolean	e_mail_browser_get_show_deleted	(EMailBrowser *browser);
 void		e_mail_browser_set_show_deleted (EMailBrowser *browser,
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index f0999be97e..b9bde5b370 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -190,7 +190,6 @@ e_mail_reader_mark_selected (EMailReader *reader,
 guint
 e_mail_reader_open_selected (EMailReader *reader)
 {
-	EMailShellBackend *mail_shell_backend;
 	EShellBackend *shell_backend;
 	MessageList *message_list;
 	CamelFolder *folder;
@@ -206,8 +205,6 @@ e_mail_reader_open_selected (EMailReader *reader)
 	shell_backend = e_mail_reader_get_shell_backend (reader);
 	window = e_mail_reader_get_window (reader);
 
-	mail_shell_backend = E_MAIL_SHELL_BACKEND (shell_backend);
-
 	folder = message_list->folder;
 	folder_uri = message_list->folder_uri;
 	uids = message_list_get_selected (message_list);
@@ -280,7 +277,7 @@ e_mail_reader_open_selected (EMailReader *reader)
 		const gchar *uid = views->pdata[ii];
 		GtkWidget *browser;
 
-		browser = e_mail_browser_new (mail_shell_backend);
+		browser = e_mail_browser_new (shell_backend);
 		e_mail_reader_set_folder (
 			E_MAIL_READER (browser), folder, folder_uri);
 		e_mail_reader_set_message (
@@ -405,9 +402,6 @@ e_mail_reader_reply_to_message (EMailReader *reader,
 	uid = message_list->cursor_uid;
 	g_return_if_fail (uid != NULL);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	if (!gtk_html_command (html, "is-selection-active"))
 		goto whole_message;
 
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index a58e0acd46..6d680aebe1 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -40,7 +40,6 @@
 #include "mail/e-mail-browser.h"
 #include "mail/e-mail-display.h"
 #include "mail/e-mail-reader-utils.h"
-#include "mail/e-mail-shell-backend.h"
 #include "mail/em-composer-utils.h"
 #include "mail/em-event.h"
 #include "mail/em-folder-selector.h"
@@ -342,9 +341,6 @@ action_mail_forward_cb (GtkAction *action,
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	folder = message_list->folder;
 	folder_uri = message_list->folder_uri;
 	uids = message_list_get_selected (message_list);
@@ -365,9 +361,6 @@ action_mail_forward_attached_cb (GtkAction *action,
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	folder = message_list->folder;
 	folder_uri = message_list->folder_uri;
 	uids = message_list_get_selected (message_list);
@@ -388,9 +381,6 @@ action_mail_forward_inline_cb (GtkAction *action,
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	folder = message_list->folder;
 	folder_uri = message_list->folder_uri;
 	uids = message_list_get_selected (message_list);
@@ -411,9 +401,6 @@ action_mail_forward_quoted_cb (GtkAction *action,
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	folder = message_list->folder;
 	folder_uri = message_list->folder_uri;
 	uids = message_list_get_selected (message_list);
@@ -517,9 +504,6 @@ action_mail_message_edit_cb (GtkAction *action,
 	window = e_mail_reader_get_window (reader);
 	message_list = e_mail_reader_get_message_list (reader);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	folder = message_list->folder;
 	uids = message_list_get_selected (message_list);
 
@@ -536,9 +520,6 @@ action_mail_message_new_cb (GtkAction *action,
 	message_list = e_mail_reader_get_message_list (reader);
 	window = e_mail_reader_get_window (reader);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	em_utils_compose_new_message (message_list->folder_uri);
 }
 
@@ -746,9 +727,6 @@ action_mail_redirect_cb (GtkAction *action,
 	uid = message_list->cursor_uid;
 	g_return_if_fail (uid != NULL);
 
-	if (!em_utils_check_user_can_send_mail (window))
-		return;
-
 	em_utils_redirect_message_by_uid (folder, uid);
 }
 
@@ -861,7 +839,6 @@ action_mail_show_source_cb (GtkAction *action,
                             EMailReader *reader)
 {
 	EMFormatHTMLDisplay *html_display;
-	EMailShellBackend *mail_shell_backend;
 	EShellBackend *shell_backend;
 	MessageList *message_list;
 	CamelFolder *folder;
@@ -871,14 +848,13 @@ action_mail_show_source_cb (GtkAction *action,
 
 	message_list = e_mail_reader_get_message_list (reader);
 	shell_backend = e_mail_reader_get_shell_backend (reader);
-	mail_shell_backend = E_MAIL_SHELL_BACKEND (shell_backend);
 
 	folder = message_list->folder;
 	folder_uri = message_list->folder_uri;
 	uids = message_list_get_selected (message_list);
 	g_return_if_fail (uids->len > 0);
 
-	browser = e_mail_browser_new (mail_shell_backend);
+	browser = e_mail_browser_new (shell_backend);
 	reader = E_MAIL_READER (browser);
 	html_display = e_mail_reader_get_html_display (reader);
 	em_format_set_mode (EM_FORMAT (html_display), EM_FORMAT_SOURCE);
@@ -2251,6 +2227,8 @@ e_mail_reader_check_state (EMailReader *reader)
 			can_flag_for_followup = TRUE;
 	}
 
+	if (em_utils_check_user_can_send_mail ())
+		state |= E_MAIL_READER_HAVE_ACCOUNT;
 	if (uids->len == 1)
 		state |= E_MAIL_READER_SELECTION_SINGLE;
 	if (uids->len > 1)
@@ -2284,8 +2262,6 @@ e_mail_reader_check_state (EMailReader *reader)
 	if (has_unread)
 		state |= E_MAIL_READER_SELECTION_HAS_UNREAD;
 #if 0  /* FIXME */
-	if (has_callto_uri)
-		state |= E_MAIL_READER_SELECTION_HAS_URI_CALLTO;
 	if (has_http_uri)
 		state |= E_MAIL_READER_SELECTION_HAS_URI_HTTP;
 	if (has_mailto_uri)
@@ -2318,7 +2294,7 @@ e_mail_reader_update_actions (EMailReader *reader)
 	gboolean enable_flag_clear;
 	gboolean enable_flag_completed;
 	gboolean enable_flag_for_followup;
-	gboolean single_message_selected;
+	gboolean have_an_account;
 	gboolean multiple_messages_selected;
 	gboolean selection_has_deleted_messages;
 	gboolean selection_has_important_messages;
@@ -2329,6 +2305,7 @@ e_mail_reader_update_actions (EMailReader *reader)
 	gboolean selection_has_unimportant_messages;
 	gboolean selection_has_unread_messages;
 	gboolean selection_is_mailing_list;
+	gboolean single_message_selected;
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
@@ -2342,6 +2319,8 @@ e_mail_reader_update_actions (EMailReader *reader)
 	disable_printing = e_shell_settings_get_boolean (
 		shell_settings, "disable-printing");
 
+	have_an_account =
+		(state & E_MAIL_READER_HAVE_ACCOUNT);
 	single_message_selected =
 		(state & E_MAIL_READER_SELECTION_SINGLE);
 	multiple_messages_selected =
@@ -2397,22 +2376,22 @@ e_mail_reader_update_actions (EMailReader *reader)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-forward";
-	sensitive = any_messages_selected;
+	sensitive = have_an_account && any_messages_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-forward-attached";
-	sensitive = any_messages_selected;
+	sensitive = have_an_account && any_messages_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-forward-inline";
-	sensitive = single_message_selected;
+	sensitive = have_an_account && single_message_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-forward-quoted";
-	sensitive = single_message_selected;
+	sensitive = have_an_account && single_message_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
@@ -2452,7 +2431,12 @@ e_mail_reader_update_actions (EMailReader *reader)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-message-edit";
-	sensitive = single_message_selected;
+	sensitive = have_an_account && single_message_selected;
+	action = e_mail_reader_get_action (reader, action_name);
+	gtk_action_set_sensitive (action, sensitive);
+
+	action_name = "mail-message-new";
+	sensitive = have_an_account;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
@@ -2502,22 +2486,23 @@ e_mail_reader_update_actions (EMailReader *reader)
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-redirect";
-	sensitive = single_message_selected;
+	sensitive = have_an_account && single_message_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-reply-all";
-	sensitive = single_message_selected;
+	sensitive = have_an_account && single_message_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-reply-list";
-	sensitive = single_message_selected && selection_is_mailing_list;
+	sensitive = have_an_account && single_message_selected &&
+		selection_is_mailing_list;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
 	action_name = "mail-reply-sender";
-	sensitive = single_message_selected;
+	sensitive = have_an_account && single_message_selected;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index c55ba92abd..08d6f23e51 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -56,22 +56,22 @@ typedef struct _EMailReader EMailReader;
 typedef struct _EMailReaderIface EMailReaderIface;
 
 enum {
-	E_MAIL_READER_SELECTION_SINGLE			= 1 << 0,
-	E_MAIL_READER_SELECTION_MULTIPLE		= 1 << 1,
-	E_MAIL_READER_SELECTION_CAN_ADD_SENDER		= 1 << 2,
-	E_MAIL_READER_SELECTION_CAN_EDIT		= 1 << 3,
-	E_MAIL_READER_SELECTION_FLAG_CLEAR		= 1 << 4,
-	E_MAIL_READER_SELECTION_FLAG_COMPLETED		= 1 << 5,
-	E_MAIL_READER_SELECTION_FLAG_FOLLOWUP		= 1 << 6,
-	E_MAIL_READER_SELECTION_HAS_DELETED		= 1 << 7,
-	E_MAIL_READER_SELECTION_HAS_IMPORTANT		= 1 << 8,
-	E_MAIL_READER_SELECTION_HAS_JUNK		= 1 << 9,
-	E_MAIL_READER_SELECTION_HAS_NOT_JUNK		= 1 << 10,
-	E_MAIL_READER_SELECTION_HAS_READ		= 1 << 11,
-	E_MAIL_READER_SELECTION_HAS_UNDELETED		= 1 << 12,
-	E_MAIL_READER_SELECTION_HAS_UNIMPORTANT		= 1 << 13,
-	E_MAIL_READER_SELECTION_HAS_UNREAD		= 1 << 14,
-	E_MAIL_READER_SELECTION_HAS_URI_CALLTO		= 1 << 15,
+	E_MAIL_READER_HAVE_ACCOUNT			= 1 << 0,
+	E_MAIL_READER_SELECTION_SINGLE			= 1 << 1,
+	E_MAIL_READER_SELECTION_MULTIPLE		= 1 << 2,
+	E_MAIL_READER_SELECTION_CAN_ADD_SENDER		= 1 << 3,
+	E_MAIL_READER_SELECTION_CAN_EDIT		= 1 << 4,
+	E_MAIL_READER_SELECTION_FLAG_CLEAR		= 1 << 5,
+	E_MAIL_READER_SELECTION_FLAG_COMPLETED		= 1 << 6,
+	E_MAIL_READER_SELECTION_FLAG_FOLLOWUP		= 1 << 7,
+	E_MAIL_READER_SELECTION_HAS_DELETED		= 1 << 8,
+	E_MAIL_READER_SELECTION_HAS_IMPORTANT		= 1 << 9,
+	E_MAIL_READER_SELECTION_HAS_JUNK		= 1 << 10,
+	E_MAIL_READER_SELECTION_HAS_NOT_JUNK		= 1 << 11,
+	E_MAIL_READER_SELECTION_HAS_READ		= 1 << 12,
+	E_MAIL_READER_SELECTION_HAS_UNDELETED		= 1 << 13,
+	E_MAIL_READER_SELECTION_HAS_UNIMPORTANT		= 1 << 14,
+	E_MAIL_READER_SELECTION_HAS_UNREAD		= 1 << 15,
 	E_MAIL_READER_SELECTION_HAS_URI_HTTP		= 1 << 16,
 	E_MAIL_READER_SELECTION_HAS_URI_MAILTO		= 1 << 17,
 	E_MAIL_READER_SELECTION_IS_MAILING_LIST		= 1 << 18
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index b92c0a2f4c..74b79d37ee 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel-store.h>
-#include <mail/e-mail-shell-backend.h>
 #include <mail/em-folder-tree-model.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-utils.c b/mail/em-utils.c
index dffa11b132..a971b90f34 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -71,21 +71,49 @@
 #include "e-util/e-account-utils.h"
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
+#include "shell/e-shell.h"
 #include "widgets/misc/e-alert-activity.h"
 #include "widgets/misc/e-attachment.h"
 
 #include "em-utils.h"
 #include "em-composer-utils.h"
 #include "em-format-quote.h"
-#include "em-account-editor.h"
-
 #include "e-mail-local.h"
-#include "e-mail-shell-backend.h"
 
 static void emu_save_part_done (CamelMimePart *part, gchar *name, gint done, gpointer data);
 
 #define d(x)
 
+const gchar *
+em_utils_get_data_dir (void)
+{
+	EShell *shell;
+	EShellBackend *shell_backend;
+
+	/* XXX This is a temporary solution until I can figure out a
+	 *     better way.  Ideally, nothing below the module layer
+	 *     should need to know about the user data directory. */
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
+	return e_shell_backend_get_data_dir (shell_backend);
+}
+
+const gchar *
+em_utils_get_config_dir (void)
+{
+	EShell *shell;
+	EShellBackend *shell_backend;
+
+	/* XXX This is a temporary solution until I can figure out a
+	 *     better way.  Ideally, nothing below the module layer
+	 *     should need to know about the user config directory. */
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
+	return e_shell_backend_get_config_dir (shell_backend);
+}
+
 /**
  * em_utils_prompt_user:
  * @parent: parent window
@@ -174,69 +202,22 @@ em_utils_uids_free (GPtrArray *uids)
 	g_ptr_array_free (uids, TRUE);
 }
 
-static void
-druid_destroy_cb (gpointer user_data, GObject *deadbeef)
-{
-	gtk_main_quit ();
-}
-
-/**
- * em_utils_configure_account:
- * @parent: parent window for the druid to be a child of.
- *
- * Displays a druid allowing the user to configure an account. If
- * @parent is non-NULL, then the druid will be created as a child
- * window of @parent's toplevel window.
- *
- * Returns %TRUE if an account has been configured or %FALSE
- * otherwise.
- **/
-gboolean
-em_utils_configure_account (GtkWindow *parent)
-{
-	EMAccountEditor *emae;
-	EAccountList *account_list;
-
-	g_return_val_if_fail (GTK_IS_WINDOW (parent), FALSE);
-
-	emae = em_account_editor_new(NULL, EMAE_DRUID, "org.gnome.evolution.mail.config.accountDruid");
-	gtk_window_set_transient_for (GTK_WINDOW (emae->editor), parent);
-
-	g_object_weak_ref((GObject *)emae->editor, (GWeakNotify) druid_destroy_cb, NULL);
-	gtk_widget_show(emae->editor);
-	gtk_grab_add(emae->editor);
-	gtk_main();
-
-	account_list = e_get_account_list ();
-
-	return (e_list_length ((EList *) account_list) > 0);
-}
-
 /**
  * em_utils_check_user_can_send_mail:
- * @parent: parent window for the druid to be a child of.
- *
- * If no accounts have been configured, the user will be given a
- * chance to configure an account. In the case that no accounts are
- * configured, a druid will be created. If @parent is non-NULL, then
- * the druid will be created as a child window of @parent's toplevel
- * window.
  *
  * Returns %TRUE if the user has an account configured (to send mail)
  * or %FALSE otherwise.
  **/
 gboolean
-em_utils_check_user_can_send_mail (GtkWindow *parent)
+em_utils_check_user_can_send_mail (void)
 {
 	EAccountList *account_list;
 	EAccount *account;
 
 	account_list = e_get_account_list ();
 
-	if (e_list_length ((EList *) account_list) == 0) {
-		if (!em_utils_configure_account (parent))
-			return FALSE;
-	}
+	if (e_list_length ((EList *) account_list) == 0)
+		return FALSE;
 
 	if (!(account = e_get_default_account ()))
 		return FALSE;
@@ -255,16 +236,13 @@ static GtkWidget *filter_editor = NULL;
 static void
 em_filter_editor_response (GtkWidget *dialog, gint button, gpointer user_data)
 {
-	EShellBackend *shell_backend;
 	EMFilterContext *fc;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	if (button == GTK_RESPONSE_OK) {
 		const gchar *data_dir;
 		gchar *user;
 
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		fc = g_object_get_data ((GObject *) dialog, "context");
 		user = g_strdup_printf ("%s/filters.xml", data_dir);
 		rule_context_save ((RuleContext *) fc, user);
@@ -293,7 +271,6 @@ static EMFilterSource em_filter_source_element_names[] = {
 void
 em_utils_edit_filters (GtkWidget *parent)
 {
-	EShellBackend *shell_backend;
 	const gchar *data_dir;
 	gchar *user, *system;
 	EMFilterContext *fc;
@@ -303,8 +280,7 @@ em_utils_edit_filters (GtkWidget *parent)
 		return;
 	}
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 
 	fc = em_filter_context_new ();
 	user = g_build_filename (data_dir, "filters.xml", NULL);
@@ -2292,10 +2268,12 @@ em_utils_clear_get_password_canceled_accounts_flag (void)
 void
 em_utils_show_error_silent (GtkWidget *widget)
 {
+	EShell *shell;
 	EShellBackend *shell_backend;
 	EActivity *activity;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
 	activity = e_alert_activity_new_warning (widget);
 	e_shell_backend_add_activity (shell_backend, activity);
@@ -2310,10 +2288,12 @@ em_utils_show_error_silent (GtkWidget *widget)
 void
 em_utils_show_info_silent (GtkWidget *widget)
 {
+	EShell *shell;
 	EShellBackend *shell_backend;
 	EActivity *activity;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
 	activity = e_alert_activity_new_info (widget);
 	e_shell_backend_add_activity (shell_backend, activity);
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 64c4d7aba7..14dc8cef23 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -38,13 +38,15 @@ G_BEGIN_DECLS
 
 struct _EMFormat;
 
+const gchar *	em_utils_get_data_dir		(void);
+const gchar *	em_utils_get_config_dir		(void);
+
 gboolean em_utils_prompt_user(GtkWindow *parent, const gchar *promptkey, const gchar *tag, const gchar *arg0, ...);
 
 GPtrArray *em_utils_uids_copy (GPtrArray *uids);
 void em_utils_uids_free (GPtrArray *uids);
 
-gboolean em_utils_configure_account (GtkWindow *parent);
-gboolean em_utils_check_user_can_send_mail (GtkWindow *parent);
+gboolean em_utils_check_user_can_send_mail (void);
 
 void em_utils_edit_filters (GtkWidget *parent);
 void em_filename_make_safe (gchar *string);
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
new file mode 100644
index 0000000000..ecd883cd8b
--- /dev/null
+++ b/mail/importers/Makefile.am
@@ -0,0 +1,33 @@
+if OS_WIN32
+WIN32_BOOTSTRAP_LIBS = \
+	$(top_builddir)/win32/libevolution-mail.la
+endif
+
+privsolib_LTLIBRARIES = libevolution-mail-importers.la
+
+INCLUDES = -I.. 					\
+	-I$(srcdir)/..					\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
+	$(IMPORTERS_CFLAGS)
+
+libevolution_mail_importers_la_SOURCES =	\
+	mail-importer.c				\
+	mail-importer.h				\
+	elm-importer.c				\
+	pine-importer.c				\
+	evolution-mbox-importer.c
+
+libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
+
+libevolution_mail_importers_la_LIBADD =				\
+	$(WIN32_BOOTSTRAP_LIBS)					\
+	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/filter/libfilter.la			\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(IMPORTERS_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index e44cf57fef..ade34526fc 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -42,7 +42,6 @@
 
 #include "mail/e-mail-local.h"
 #include "mail/e-mail-store.h"
-#include "mail/e-mail-shell-backend.h"
 #include "mail/em-folder-selection-button.h"
 #include "mail/em-folder-tree-model.h"
 #include "mail/mail-mt.h"
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 1e1f423316..dd4de6370b 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -45,12 +45,12 @@
 #include <camel/camel-stream-mem.h>
 
 #include "e-util/e-util-private.h"
+#include "shell/e-shell-backend.h"
 
-#include "mail/mail-mt.h"
-#include "mail/mail-tools.h"
-
-#include "mail/e-mail-local.h"
-#include "mail/e-mail-shell-backend.h"
+#include "mail-mt.h"
+#include "mail-tools.h"
+#include "e-mail-local.h"
+#include "em-utils.h"
 
 #include "mail-importer.h"
 
@@ -358,7 +358,6 @@ struct _import_folders_data {
 static void
 import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const gchar *folderparent)
 {
-	EShellBackend *shell_backend;
 	GDir *dir;
 	const gchar *d;
 	struct stat st;
@@ -370,8 +369,7 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const
 	if (dir == NULL)
 		return;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 
 	utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL);
 	camel_operation_start(NULL, _("Scanning %s"), utf8_filename);
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index a9f757e6fa..fd7fc5752b 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -48,8 +48,6 @@
 #include <camel/camel-internet-address.h>
 #include <camel/camel-mime-message.h>
 
-#include "e-mail-shell-backend.h"
-
 #define d(x)
 
 static void
@@ -346,7 +344,6 @@ filter_rule_from_message (EMFilterContext *context, CamelMimeMessage *msg, gint
 void
 filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint flags)
 {
-	EShellBackend *shell_backend;
 	EMFilterContext *fc;
 	const gchar *data_dir;
 	gchar *user, *system;
@@ -354,10 +351,8 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint fl
 
 	g_return_if_fail (msg != NULL);
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	fc = em_filter_context_new ();
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	user = g_build_filename (data_dir, "filters.xml", NULL);
 	system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL);
 	rule_context_load ((RuleContext *)fc, system, user);
@@ -375,7 +370,6 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint fl
 void
 mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newuri)
 {
-	EShellBackend *shell_backend;
 	EMFilterContext *fc;
 	const gchar *data_dir;
 	gchar *user, *system;
@@ -385,10 +379,8 @@ mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newu
 	eolduri = em_uri_from_camel(olduri);
 	enewuri = em_uri_from_camel(newuri);
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	fc = em_filter_context_new ();
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	user = g_build_filename (data_dir, "filters.xml", NULL);
 	system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL);
 	rule_context_load ((RuleContext *)fc, system, user);
@@ -412,7 +404,6 @@ mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newu
 void
 mail_filter_delete_uri(CamelStore *store, const gchar *uri)
 {
-	EShellBackend *shell_backend;
 	EMFilterContext *fc;
 	const gchar *data_dir;
 	gchar *user, *system;
@@ -421,10 +412,8 @@ mail_filter_delete_uri(CamelStore *store, const gchar *uri)
 
 	euri = em_uri_from_camel(uri);
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	fc = em_filter_context_new ();
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	user = g_build_filename (data_dir, "filters.xml", NULL);
 	system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL);
 	rule_context_load ((RuleContext *)fc, system, user);
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 09763920eb..b1cfd5ab29 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -63,9 +63,8 @@
 #include "mail-config.h"
 #include "mail-mt.h"
 #include "mail-tools.h"
-
+#include "em-utils.h"
 #include "e-mail-local.h"
-#include "e-mail-shell-backend.h"
 
 typedef struct {
 	GConfClient *gconf;
@@ -773,13 +772,11 @@ mail_config_get_default_transport (void)
 static gchar *
 uri_to_evname (const gchar *uri, const gchar *prefix)
 {
-	EShellBackend *shell_backend;
 	const gchar *data_dir;
 	gchar *safe;
 	gchar *tmp;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 
 	safe = g_strdup (uri);
 	e_filename_make_safe (safe);
@@ -908,13 +905,10 @@ mail_config_folder_to_safe_url (CamelFolder *folder)
 gchar *
 mail_config_folder_to_cachename (CamelFolder *folder, const gchar *prefix)
 {
-	EShellBackend *shell_backend;
 	gchar *url, *basename, *filename;
 	const gchar *config_dir;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-	config_dir = e_shell_backend_get_config_dir (shell_backend);
-
+	config_dir = em_utils_get_config_dir ();
 	url = mail_config_folder_to_safe_url (folder);
 	basename = g_strdup_printf ("%s%s", prefix, url);
 	filename = g_build_filename (config_dir, basename, NULL);
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index faa80b2629..b3d7a1e12b 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -64,6 +64,7 @@
 #include "em-folder-tree-model.h"
 
 #include "em-event.h"
+#include "em-utils.h"
 
 #include "e-mail-local.h"
 #include "e-mail-store.h"
@@ -629,7 +630,6 @@ folder_to_url(CamelStore *store, const gchar *full_name)
 static void
 rename_folders(struct _store_info *si, const gchar *oldbase, const gchar *newbase, CamelFolderInfo *fi)
 {
-	EShellBackend *shell_backend;
 	gchar *old, *olduri, *oldfile, *newuri, *newfile;
 	struct _folder_info *mfi;
 	struct _folder_update *up;
@@ -689,8 +689,7 @@ rename_folders(struct _store_info *si, const gchar *oldbase, const gchar *newbas
 #endif
 
 	/* rename the meta-data we maintain ourselves */
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-	config_dir = e_shell_backend_get_config_dir (shell_backend);
+	config_dir = em_utils_get_config_dir ();
 	olduri = folder_to_url(si->store, old);
 	e_filename_make_safe(olduri);
 	newuri = folder_to_url(si->store, fi->full_name);
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index ade31e56b9..c5b6edaa14 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -34,6 +34,7 @@
 #include <camel/camel-url.h>
 #include <camel/camel-operation.h>
 
+#include "shell/e-shell.h"
 #include "misc/e-gui-utils.h"
 #include "e-util/e-error.h"
 #include "e-util/e-icon-factory.h"
@@ -43,8 +44,6 @@
 #include "mail-session.h"
 #include "mail-mt.h"
 
-#include "e-mail-shell-backend.h"
-
 /*#define MALLOC_CHECK*/
 #define LOG_OPS
 #define LOG_LOCKS
@@ -142,9 +141,11 @@ mail_msg_new (MailMsgInfo *info)
 static void
 end_event_callback (CamelObject *o, EActivity *activity, gpointer error)
 {
+	EShell *shell;
 	EShellBackend *shell_backend;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
 	if (error == NULL) {
 		e_activity_complete (activity);
@@ -941,6 +942,7 @@ struct _op_status_msg {
 static void
 op_status_exec (struct _op_status_msg *m)
 {
+	EShell *shell;
 	EShellBackend *shell_backend;
 	MailMsg *msg;
 	MailMsgPrivate *data;
@@ -949,7 +951,8 @@ op_status_exec (struct _op_status_msg *m)
 
 	g_return_if_fail (mail_in_main_thread ());
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
+	shell = e_shell_get_default ();
+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
 	MAIL_MT_LOCK (mail_msg_lock);
 
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index a88a55e6c2..1c00420f89 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -70,12 +70,12 @@
 #include "mail-vfolder.h"
 
 #include "e-mail-local.h"
-#include "e-mail-shell-backend.h"
 
 #define w(x)
 #define d(x)
 
-extern const gchar *x_mailer;
+/* XXX Make this a preprocessor definition. */
+const gchar *x_mailer = "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT;
 
 /* used for both just filtering a folder + uid's, and for filtering a whole folder */
 /* used both for fetching mail, and for filtering mail */
@@ -247,19 +247,16 @@ static gchar *
 uid_cachename_hack (CamelStore *store)
 {
 	CamelURL *url = CAMEL_SERVICE (store)->url;
-	EShellBackend *shell_backend;
 	gchar *encoded_url, *filename;
 	const gchar *data_dir;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	encoded_url = g_strdup_printf ("%s%s%s@%s", url->user,
 				       url->authmech ? ";auth=" : "",
 				       url->authmech ? url->authmech : "",
 				       url->host);
 	e_filename_make_safe (encoded_url);
 
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	filename = g_build_filename (data_dir, "pop", encoded_url, "uid-cache", NULL);
 	g_free (encoded_url);
 
@@ -1762,17 +1759,14 @@ empty_trash_desc (struct _empty_trash_msg *m)
 static void
 empty_trash_exec (struct _empty_trash_msg *m)
 {
-	EShellBackend *shell_backend;
 	const gchar *data_dir;
 	CamelFolder *trash;
 	gchar *uri;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	if (m->account) {
 		trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex);
 	} else {
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		uri = g_strdup_printf ("mbox:%s/local", data_dir);
 		trash = mail_tool_get_trash (uri, TRUE, &m->base.ex);
 		g_free (uri);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 2f9cd77de6..9cc75057fa 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -51,7 +51,6 @@
 #include "e-util/gconf-bridge.h"
 
 #include "e-mail-local.h"
-#include "e-mail-shell-backend.h"
 
 #define d(x)
 
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 862b611d15..bdb5d915c9 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -83,7 +83,7 @@ typedef struct _MailSessionClass {
 
 } MailSessionClass;
 
-static EMailShellBackend *session_mail_shell_backend;
+static EShellBackend *session_shell_backend;
 static CamelSessionClass *ms_parent_class;
 
 static gchar *get_password(CamelSession *session, CamelService *service, const gchar *domain, const gchar *prompt, const gchar *item, guint32 flags, CamelException *ex);
@@ -503,7 +503,6 @@ session_system_beep (CamelFilterDriver *driver, gpointer user_data)
 static CamelFilterDriver *
 main_get_filter_driver (CamelSession *session, const gchar *type, CamelException *ex)
 {
-	EShellBackend *shell_backend;
 	CamelFilterDriver *driver;
 	FilterRule *rule = NULL;
 	const gchar *data_dir;
@@ -512,9 +511,8 @@ main_get_filter_driver (CamelSession *session, const gchar *type, CamelException
 	RuleContext *fc;
 
 	gconf = mail_config_get_gconf_client ();
-	shell_backend = E_SHELL_BACKEND (session_mail_shell_backend);
 
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = e_shell_backend_get_data_dir (session_shell_backend);
 	user = g_build_filename (data_dir, "filters.xml", NULL);
 	system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL);
 	fc = (RuleContext *) em_filter_context_new ();
@@ -708,17 +706,15 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry,
 }
 
 void
-mail_session_init (EMailShellBackend *mail_shell_backend)
+mail_session_init (EShellBackend *shell_backend)
 {
 	EShell *shell;
-	EShellBackend *shell_backend;
 	GConfClient *gconf;
 	gboolean online;
 	const gchar *data_dir;
 
-	session_mail_shell_backend = mail_shell_backend;
+	session_shell_backend = shell_backend;
 
-	shell_backend = E_SHELL_BACKEND (mail_shell_backend);
 	shell = e_shell_backend_get_shell (shell_backend);
 	online = e_shell_get_online (shell);
 
diff --git a/mail/mail-session.h b/mail/mail-session.h
index 450404efcd..b1274403c0 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -25,11 +25,11 @@
 
 #include <glib.h>
 #include <camel/camel-session.h>
-#include <mail/e-mail-shell-backend.h>
+#include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
 
-void mail_session_init (EMailShellBackend *mail_shell_backend);
+void mail_session_init (EShellBackend *shell_backend);
 void mail_session_shutdown (void);
 gboolean mail_session_get_interactive (void);
 void mail_session_set_interactive (gboolean interactive);
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 67407ae81f..a19c3dedb4 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -58,8 +58,6 @@
 #include "mail-tools.h"
 #include "mail-vfolder.h"
 
-#include "e-mail-shell-backend.h"
-
 /* **************************************** */
 
 CamelFolder *
@@ -107,7 +105,6 @@ mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex)
 static gchar *
 mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex)
 {
-	EShellBackend *shell_backend;
 	guchar *safe_uri, *c;
 	const gchar *data_dir;
 	gchar *path, *full;
@@ -118,8 +115,7 @@ mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex)
 		if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((gint) *c))
 			*c = '_';
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	path = g_build_filename (data_dir, "spool", NULL);
 
 	if (g_stat(path, &st) == -1 && g_mkdir_with_parents(path, 0777) == -1) {
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5a5f7324ed..487eea0e10 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -52,7 +52,6 @@
 
 #include "e-mail-local.h"
 #include "e-mail-store.h"
-#include "e-mail-shell-backend.h"
 
 #define d(x)  /* (printf("%s:%s: ",  G_STRLOC, G_STRFUNC), (x))*/
 
@@ -533,7 +532,6 @@ done:
 void
 mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
 {
-	EShellBackend *shell_backend;
 	FilterRule *rule;
 	const gchar *source;
 	CamelVeeFolder *vf;
@@ -550,8 +548,6 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
 
 	g_return_if_fail (mail_in_main_thread());
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	changed = g_string_new ("");
 
 	LOCK();
@@ -612,7 +608,7 @@ done:
 		dialog = e_error_new(NULL, "mail:vfolder-updated", changed->str, uri, NULL);
 		em_utils_show_info_silent (dialog);
 
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
 		rule_context_save ((RuleContext *) context, user);
 		g_free (user);
@@ -627,7 +623,6 @@ done:
 void
 mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
 {
-	EShellBackend *shell_backend;
 	FilterRule *rule;
 	const gchar *source;
 	CamelVeeFolder *vf;
@@ -641,8 +636,6 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
 
 	g_return_if_fail (mail_in_main_thread());
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	from = em_uri_from_camel(cfrom);
 	to = em_uri_from_camel(cto);
 
@@ -683,7 +676,7 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
 		gchar *user;
 
 		d(printf("Vfolders updated from renamed folder\n"));
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
@@ -837,7 +830,6 @@ store_folder_created(CamelObject *o, gpointer event_data, gpointer data)
 static void
 store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
 {
-	EShellBackend *shell_backend;
 	CamelStore *store = (CamelStore *)o;
 	CamelFolderInfo *info = event_data;
 	FilterRule *rule;
@@ -846,8 +838,6 @@ store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
 	d(printf("Folder deleted: %s\n", info->name));
 	store = store;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	/* Warning not thread safe, but might be enough */
 
 	LOCK();
@@ -864,7 +854,7 @@ store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
 		g_object_unref(rule);
 		g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
 
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
@@ -878,15 +868,12 @@ store_folder_deleted(CamelObject *o, gpointer event_data, gpointer data)
 static void
 store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
 {
-	EShellBackend *shell_backend;
 	CamelRenameInfo *info = event_data;
 	FilterRule *rule;
 	gchar *user;
 
 	gpointer key, folder;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	/* This should be more-or-less thread-safe */
 
 	d(printf("Folder renamed to '%s' from '%s'\n", info->new->full_name, info->old_base));
@@ -913,7 +900,7 @@ store_folder_renamed(CamelObject *o, gpointer event_data, gpointer data)
 		filter_rule_set_name(rule, info->new->full_name);
 		g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
 
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
@@ -931,15 +918,12 @@ vfolder_load_storage(void)
 	/* lock for loading storage, it is safe to call it more than once */
 	static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 
-	EShellBackend *shell_backend;
 	const gchar *data_dir;
 	gchar *user, *storeuri;
 	FilterRule *rule;
 	gchar *xmlfile;
 	GConfClient *gconf;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	pthread_mutex_lock (&lock);
 
 	if (vfolder_hash) {
@@ -953,7 +937,7 @@ vfolder_load_storage(void)
 	pthread_mutex_unlock (&lock);
 
 	/* first, create the vfolder store, and set it up */
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	storeuri = g_strdup_printf("vfolder:%s/vfolder", data_dir);
 	vfolder_store = camel_session_get_store(session, storeuri, NULL);
 	if (vfolder_store == NULL) {
@@ -1010,14 +994,11 @@ vfolder_load_storage(void)
 void
 vfolder_revert(void)
 {
-	EShellBackend *shell_backend;
 	const gchar *data_dir;
 	gchar *user;
 
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	d(printf("vfolder_revert\n"));
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
+	data_dir = em_utils_get_data_dir ();
 	user = g_build_filename (data_dir, "vfolders.xml", NULL);
 	rule_context_revert((RuleContext *)context, user);
 	g_free(user);
@@ -1064,10 +1045,6 @@ vfolder_edit (EShellView *shell_view)
 static void
 edit_rule_response(GtkWidget *w, gint button, gpointer data)
 {
-	EShellBackend *shell_backend;
-
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	if (button == GTK_RESPONSE_OK) {
 		const gchar *data_dir;
 		gchar *user;
@@ -1075,7 +1052,7 @@ edit_rule_response(GtkWidget *w, gint button, gpointer data)
 		FilterRule *orig = g_object_get_data (G_OBJECT (w), "orig");
 
 		filter_rule_copy(orig, rule);
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
@@ -1132,10 +1109,6 @@ vfolder_edit_rule(const gchar *uri)
 static void
 new_rule_clicked(GtkWidget *w, gint button, gpointer data)
 {
-	EShellBackend *shell_backend;
-
-	shell_backend = E_SHELL_BACKEND (global_mail_shell_backend);
-
 	if (button == GTK_RESPONSE_OK) {
 		const gchar *data_dir;
 		gchar *user;
@@ -1154,7 +1127,7 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data)
 
 		g_object_ref(rule);
 		rule_context_add_rule((RuleContext *)context, rule);
-		data_dir = e_shell_backend_get_data_dir (shell_backend);
+		data_dir = em_utils_get_data_dir ();
 		user = g_build_filename (data_dir, "vfolders.xml", NULL);
 		rule_context_save((RuleContext *)context, user);
 		g_free(user);
diff --git a/modules/Makefile.am b/modules/Makefile.am
new file mode 100644
index 0000000000..5030d2aeb6
--- /dev/null
+++ b/modules/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = addressbook calendar mail
+
+-include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/component/Makefile.am b/modules/addressbook/Makefile.am
index cd9dfc1434..960df59e09 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -1,5 +1,5 @@
 if OS_WIN32
-WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail-shared.la
+WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail.la
 endif
 
 INCLUDES =							\
diff --git a/addressbook/gui/component/addressbook-config.c b/modules/addressbook/addressbook-config.c
index e663de03da..e663de03da 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
diff --git a/addressbook/gui/component/addressbook-config.h b/modules/addressbook/addressbook-config.h
index 26c1788e51..26c1788e51 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/modules/addressbook/addressbook-config.h
diff --git a/addressbook/gui/component/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in
index 4a336409df..4a336409df 100644
--- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in
+++ b/modules/addressbook/apps_evolution_addressbook.schemas.in
diff --git a/addressbook/gui/component/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 370c1a1e7e..370c1a1e7e 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
diff --git a/addressbook/gui/component/autocompletion-config.h b/modules/addressbook/autocompletion-config.h
index 5769bdce9d..5769bdce9d 100644
--- a/addressbook/gui/component/autocompletion-config.h
+++ b/modules/addressbook/autocompletion-config.h
diff --git a/addressbook/gui/component/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 68af7ed03b..68af7ed03b 100644
--- a/addressbook/gui/component/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
diff --git a/addressbook/gui/component/e-book-shell-backend.h b/modules/addressbook/e-book-shell-backend.h
index c61e43b814..c61e43b814 100644
--- a/addressbook/gui/component/e-book-shell-backend.h
+++ b/modules/addressbook/e-book-shell-backend.h
diff --git a/addressbook/gui/component/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index cce03b1575..cce03b1575 100644
--- a/addressbook/gui/component/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
diff --git a/addressbook/gui/component/e-book-shell-content.h b/modules/addressbook/e-book-shell-content.h
index ac5ab10e8b..da78c01274 100644
--- a/addressbook/gui/component/e-book-shell-content.h
+++ b/modules/addressbook/e-book-shell-content.h
@@ -27,8 +27,8 @@
 #include "shell/e-shell-content.h"
 #include "shell/e-shell-view.h"
 
-#include "addressbook/gui/component/eab-composer-util.h"
 #include "addressbook/gui/widgets/e-addressbook-view.h"
+#include "eab-composer-util.h"
 
 /* Standard GObject macros */
 #define E_TYPE_BOOK_SHELL_CONTENT \
diff --git a/addressbook/gui/component/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index fce6e0a634..fce6e0a634 100644
--- a/addressbook/gui/component/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
diff --git a/addressbook/gui/component/e-book-shell-migrate.h b/modules/addressbook/e-book-shell-migrate.h
index cb6128910a..cb6128910a 100644
--- a/addressbook/gui/component/e-book-shell-migrate.h
+++ b/modules/addressbook/e-book-shell-migrate.h
diff --git a/addressbook/gui/component/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index fc283e28d7..fc283e28d7 100644
--- a/addressbook/gui/component/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
diff --git a/addressbook/gui/component/e-book-shell-sidebar.h b/modules/addressbook/e-book-shell-sidebar.h
index 716523f971..716523f971 100644
--- a/addressbook/gui/component/e-book-shell-sidebar.h
+++ b/modules/addressbook/e-book-shell-sidebar.h
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 773eb3fa7a..773eb3fa7a 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
diff --git a/addressbook/gui/component/e-book-shell-view-actions.h b/modules/addressbook/e-book-shell-view-actions.h
index 8e3d31f7bf..8e3d31f7bf 100644
--- a/addressbook/gui/component/e-book-shell-view-actions.h
+++ b/modules/addressbook/e-book-shell-view-actions.h
diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c
index ec3562e87a..ec3562e87a 100644
--- a/addressbook/gui/component/e-book-shell-view-private.c
+++ b/modules/addressbook/e-book-shell-view-private.c
diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index b4701aea81..b4701aea81 100644
--- a/addressbook/gui/component/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
diff --git a/addressbook/gui/component/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index ea48bb534c..ea48bb534c 100644
--- a/addressbook/gui/component/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
diff --git a/addressbook/gui/component/e-book-shell-view.h b/modules/addressbook/e-book-shell-view.h
index 33a0c8a75d..33a0c8a75d 100644
--- a/addressbook/gui/component/e-book-shell-view.h
+++ b/modules/addressbook/e-book-shell-view.h
diff --git a/addressbook/gui/component/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index 6d45f13a94..6d45f13a94 100644
--- a/addressbook/gui/component/eab-composer-util.c
+++ b/modules/addressbook/eab-composer-util.c
diff --git a/addressbook/gui/component/eab-composer-util.h b/modules/addressbook/eab-composer-util.h
index 4aec23074d..4aec23074d 100644
--- a/addressbook/gui/component/eab-composer-util.h
+++ b/modules/addressbook/eab-composer-util.h
diff --git a/addressbook/gui/component/evolution-module-addressbook.c b/modules/addressbook/evolution-module-addressbook.c
index 3089133e43..3089133e43 100644
--- a/addressbook/gui/component/evolution-module-addressbook.c
+++ b/modules/addressbook/evolution-module-addressbook.c
diff --git a/addressbook/gui/component/ldap-config.glade b/modules/addressbook/ldap-config.glade
index f87cf84b14..f87cf84b14 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/modules/addressbook/ldap-config.glade
diff --git a/addressbook/gui/component/openldap-extract.h b/modules/addressbook/openldap-extract.h
index 996bf370a8..996bf370a8 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/modules/addressbook/openldap-extract.h
diff --git a/calendar/module/Makefile.am b/modules/calendar/Makefile.am
index 59c6f8098d..9c2d41dc38 100644
--- a/calendar/module/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -64,7 +64,7 @@ libevolution_module_calendar_la_LIBADD =		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/calendar/gui/libcal-gui.la	\
 	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la	\
-	$(top_builddir)/mail/libevolution-module-mail.la \
+	$(top_builddir)/mail/libevolution-mail.la \
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la	\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(top_builddir)/e-util/libeutil.la				\
diff --git a/calendar/module/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 675a3d4fa6..675a3d4fa6 100644
--- a/calendar/module/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
diff --git a/calendar/module/e-cal-shell-backend.h b/modules/calendar/e-cal-shell-backend.h
index 497e200490..497e200490 100644
--- a/calendar/module/e-cal-shell-backend.h
+++ b/modules/calendar/e-cal-shell-backend.h
diff --git a/calendar/module/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 6afb40dce7..6afb40dce7 100644
--- a/calendar/module/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
diff --git a/calendar/module/e-cal-shell-content.h b/modules/calendar/e-cal-shell-content.h
index 44e13f733c..44e13f733c 100644
--- a/calendar/module/e-cal-shell-content.h
+++ b/modules/calendar/e-cal-shell-content.h
diff --git a/calendar/module/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index 9887a5332c..9887a5332c 100644
--- a/calendar/module/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
diff --git a/calendar/module/e-cal-shell-migrate.h b/modules/calendar/e-cal-shell-migrate.h
index 359ca5ea22..359ca5ea22 100644
--- a/calendar/module/e-cal-shell-migrate.h
+++ b/modules/calendar/e-cal-shell-migrate.h
diff --git a/calendar/module/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index 03af4aeebc..03af4aeebc 100644
--- a/calendar/module/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
diff --git a/calendar/module/e-cal-shell-settings.h b/modules/calendar/e-cal-shell-settings.h
index de8b22888b..de8b22888b 100644
--- a/calendar/module/e-cal-shell-settings.h
+++ b/modules/calendar/e-cal-shell-settings.h
diff --git a/calendar/module/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index dc7df596d6..dc7df596d6 100644
--- a/calendar/module/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
diff --git a/calendar/module/e-cal-shell-sidebar.h b/modules/calendar/e-cal-shell-sidebar.h
index c555537abf..c555537abf 100644
--- a/calendar/module/e-cal-shell-sidebar.h
+++ b/modules/calendar/e-cal-shell-sidebar.h
diff --git a/calendar/module/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index 02b7af609e..02b7af609e 100644
--- a/calendar/module/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
diff --git a/calendar/module/e-cal-shell-view-actions.h b/modules/calendar/e-cal-shell-view-actions.h
index b02906f179..b02906f179 100644
--- a/calendar/module/e-cal-shell-view-actions.h
+++ b/modules/calendar/e-cal-shell-view-actions.h
diff --git a/calendar/module/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index ecee72d8b5..ecee72d8b5 100644
--- a/calendar/module/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
diff --git a/calendar/module/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index f681a2c2f3..f681a2c2f3 100644
--- a/calendar/module/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
diff --git a/calendar/module/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 8308e0bf7f..8308e0bf7f 100644
--- a/calendar/module/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
diff --git a/calendar/module/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index bdd136b6f7..bdd136b6f7 100644
--- a/calendar/module/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
diff --git a/calendar/module/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 5bf1c749a1..5bf1c749a1 100644
--- a/calendar/module/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
diff --git a/calendar/module/e-cal-shell-view.h b/modules/calendar/e-cal-shell-view.h
index 67fa15220c..67fa15220c 100644
--- a/calendar/module/e-cal-shell-view.h
+++ b/modules/calendar/e-cal-shell-view.h
diff --git a/calendar/module/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index d2734e066a..d2734e066a 100644
--- a/calendar/module/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
diff --git a/calendar/module/e-memo-shell-backend.h b/modules/calendar/e-memo-shell-backend.h
index 37fe41a784..37fe41a784 100644
--- a/calendar/module/e-memo-shell-backend.h
+++ b/modules/calendar/e-memo-shell-backend.h
diff --git a/calendar/module/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index ce020158ae..ce020158ae 100644
--- a/calendar/module/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
diff --git a/calendar/module/e-memo-shell-content.h b/modules/calendar/e-memo-shell-content.h
index 84c22d6ce4..84c22d6ce4 100644
--- a/calendar/module/e-memo-shell-content.h
+++ b/modules/calendar/e-memo-shell-content.h
diff --git a/calendar/module/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index d2e7df6d1b..d2e7df6d1b 100644
--- a/calendar/module/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
diff --git a/calendar/module/e-memo-shell-migrate.h b/modules/calendar/e-memo-shell-migrate.h
index ba163c6950..ba163c6950 100644
--- a/calendar/module/e-memo-shell-migrate.h
+++ b/modules/calendar/e-memo-shell-migrate.h
diff --git a/calendar/module/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index ca5d05c40b..ca5d05c40b 100644
--- a/calendar/module/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
diff --git a/calendar/module/e-memo-shell-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h
index 665c8f218a..665c8f218a 100644
--- a/calendar/module/e-memo-shell-sidebar.h
+++ b/modules/calendar/e-memo-shell-sidebar.h
diff --git a/calendar/module/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 1736606abe..1736606abe 100644
--- a/calendar/module/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
diff --git a/calendar/module/e-memo-shell-view-actions.h b/modules/calendar/e-memo-shell-view-actions.h
index d6fd3ca514..d6fd3ca514 100644
--- a/calendar/module/e-memo-shell-view-actions.h
+++ b/modules/calendar/e-memo-shell-view-actions.h
diff --git a/calendar/module/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index 69d6c0afe2..69d6c0afe2 100644
--- a/calendar/module/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
diff --git a/calendar/module/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h
index c41eaed7c0..c41eaed7c0 100644
--- a/calendar/module/e-memo-shell-view-private.h
+++ b/modules/calendar/e-memo-shell-view-private.h
diff --git a/calendar/module/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index e2964b061c..e2964b061c 100644
--- a/calendar/module/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
diff --git a/calendar/module/e-memo-shell-view.h b/modules/calendar/e-memo-shell-view.h
index 686ae734c9..686ae734c9 100644
--- a/calendar/module/e-memo-shell-view.h
+++ b/modules/calendar/e-memo-shell-view.h
diff --git a/calendar/module/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 6bded3e412..6bded3e412 100644
--- a/calendar/module/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
diff --git a/calendar/module/e-task-shell-backend.h b/modules/calendar/e-task-shell-backend.h
index 63b157ad85..63b157ad85 100644
--- a/calendar/module/e-task-shell-backend.h
+++ b/modules/calendar/e-task-shell-backend.h
diff --git a/calendar/module/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 0177c6c3c3..0177c6c3c3 100644
--- a/calendar/module/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
diff --git a/calendar/module/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h
index 7e0b2128a7..7e0b2128a7 100644
--- a/calendar/module/e-task-shell-content.h
+++ b/modules/calendar/e-task-shell-content.h
diff --git a/calendar/module/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index ced54bafdf..ced54bafdf 100644
--- a/calendar/module/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
diff --git a/calendar/module/e-task-shell-migrate.h b/modules/calendar/e-task-shell-migrate.h
index 4cb91c9f4a..4cb91c9f4a 100644
--- a/calendar/module/e-task-shell-migrate.h
+++ b/modules/calendar/e-task-shell-migrate.h
diff --git a/calendar/module/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 827a0a037e..827a0a037e 100644
--- a/calendar/module/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
diff --git a/calendar/module/e-task-shell-sidebar.h b/modules/calendar/e-task-shell-sidebar.h
index 5d4c74fe11..5d4c74fe11 100644
--- a/calendar/module/e-task-shell-sidebar.h
+++ b/modules/calendar/e-task-shell-sidebar.h
diff --git a/calendar/module/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 4deed9fdf0..4deed9fdf0 100644
--- a/calendar/module/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
diff --git a/calendar/module/e-task-shell-view-actions.h b/modules/calendar/e-task-shell-view-actions.h
index d7db39bcc9..d7db39bcc9 100644
--- a/calendar/module/e-task-shell-view-actions.h
+++ b/modules/calendar/e-task-shell-view-actions.h
diff --git a/calendar/module/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index d6fd8e35aa..d6fd8e35aa 100644
--- a/calendar/module/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
diff --git a/calendar/module/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index d3bb3cf086..d3bb3cf086 100644
--- a/calendar/module/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
diff --git a/calendar/module/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index ce1b53a43c..ce1b53a43c 100644
--- a/calendar/module/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
diff --git a/calendar/module/e-task-shell-view.h b/modules/calendar/e-task-shell-view.h
index 8478e53cc2..8478e53cc2 100644
--- a/calendar/module/e-task-shell-view.h
+++ b/modules/calendar/e-task-shell-view.h
diff --git a/calendar/module/evolution-module-calendar.c b/modules/calendar/evolution-module-calendar.c
index 63bf98ead9..63bf98ead9 100644
--- a/calendar/module/evolution-module-calendar.c
+++ b/modules/calendar/evolution-module-calendar.c
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
new file mode 100644
index 0000000000..ab73a5d542
--- /dev/null
+++ b/modules/mail/Makefile.am
@@ -0,0 +1,56 @@
+INCLUDES =								\
+	-I$(top_srcdir)							\
+	-I$(top_srcdir)/mail						\
+	-I$(top_srcdir)/widgets						\
+	$(EVOLUTION_MAIL_CFLAGS)					\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
+	-DG_LOG_DOMAIN=\"evolution-module-mail\"
+
+module_LTLIBRARIES = libevolution-module-mail.la
+
+libevolution_module_mail_la_SOURCES =					\
+	evolution-module-mail.c						\
+	e-attachment-handler-mail.c					\
+	e-attachment-handler-mail.h					\
+	e-mail-shell-backend.c						\
+	e-mail-shell-backend.h						\
+	e-mail-shell-content.c						\
+	e-mail-shell-content.h						\
+	e-mail-shell-migrate.c						\
+	e-mail-shell-migrate.h						\
+	e-mail-shell-settings.c						\
+	e-mail-shell-settings.h						\
+	e-mail-shell-sidebar.c						\
+	e-mail-shell-sidebar.h						\
+	e-mail-shell-view.c						\
+	e-mail-shell-view.h						\
+	e-mail-shell-view-actions.c					\
+	e-mail-shell-view-actions.h					\
+	e-mail-shell-view-private.c					\
+	e-mail-shell-view-private.h					\
+	em-account-editor.c						\
+	em-account-editor.h						\
+	em-account-prefs.c						\
+	em-account-prefs.h						\
+	em-composer-prefs.c						\
+	em-composer-prefs.h						\
+	em-mailer-prefs.c						\
+	em-mailer-prefs.h						\
+	em-network-prefs.c						\
+	em-network-prefs.h
+
+libevolution_module_mail_la_LIBADD =					\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/shell/libeshell.la				\
+	$(top_builddir)/composer/libcomposer.la				\
+	$(top_builddir)/widgets/table/libetable.la			\
+	$(top_builddir)/widgets/text/libetext.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+	$(top_builddir)/mail/importers/libevolution-mail-importers.la
+
+libevolution_module_mail_la_LDFLAGS =					\
+	-avoid-version -module $(NO_UNDEFINED)
+
+-include $(top_srcdir)/git.mk
diff --git a/mail/e-attachment-handler-mail.c b/modules/mail/e-attachment-handler-mail.c
index c17c97d8ca..c17c97d8ca 100644
--- a/mail/e-attachment-handler-mail.c
+++ b/modules/mail/e-attachment-handler-mail.c
diff --git a/mail/e-attachment-handler-mail.h b/modules/mail/e-attachment-handler-mail.h
index c62ea99cab..c62ea99cab 100644
--- a/mail/e-attachment-handler-mail.h
+++ b/modules/mail/e-attachment-handler-mail.h
diff --git a/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 906312ccff..3dcb7b1391 100644
--- a/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -45,6 +45,7 @@
 #include "e-mail-browser.h"
 #include "e-mail-reader.h"
 #include "e-mail-store.h"
+#include "em-account-editor.h"
 #include "em-account-prefs.h"
 #include "em-composer-prefs.h"
 #include "em-composer-utils.h"
@@ -75,9 +76,6 @@ struct _EMailShellBackendPrivate {
 	guint mail_sync_timeout_source_id;
 };
 
-/* XXX Make this a preprocessor definition. */
-const gchar *x_mailer = "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT;
-
 static gpointer parent_class;
 static GType mail_shell_backend_type;
 
@@ -88,6 +86,30 @@ EMailShellBackend *global_mail_shell_backend = NULL;
 
 extern gint camel_application_is_exiting;
 
+static gboolean
+mail_shell_backend_run_account_druid (GtkWindow *parent)
+{
+	EAccountList *account_list;
+	EMAccountEditor *account_editor;
+
+	account_editor = em_account_editor_new (
+		NULL, EMAE_DRUID,
+		"org.gnome.evolution.mail.config.accountDruid");
+	if (GTK_IS_WINDOW (parent))
+		gtk_window_set_transient_for (
+			GTK_WINDOW (account_editor->editor), parent);
+	g_object_weak_ref (
+		G_OBJECT (account_editor->editor),
+		(GWeakNotify) gtk_main_quit, NULL);
+	gtk_widget_show (account_editor->editor);
+	gtk_grab_add (account_editor->editor);
+	gtk_main ();
+
+	account_list = e_get_account_list ();
+
+	return (e_list_length ((EList *) account_list) > 0);
+}
+
 static void
 mail_shell_backend_init_hooks (void)
 {
@@ -163,7 +185,6 @@ static void
 action_mail_message_new_cb (GtkAction *action,
                             EShellWindow *shell_window)
 {
-	GtkWindow *window = GTK_WINDOW (shell_window);
 	EMailShellSidebar *mail_shell_sidebar;
 	EShellSidebar *shell_sidebar;
 	EShellView *shell_view;
@@ -171,7 +192,7 @@ action_mail_message_new_cb (GtkAction *action,
 	const gchar *view_name;
 	gchar *uri = NULL;
 
-	if (!em_utils_check_user_can_send_mail (window))
+	if (!em_utils_check_user_can_send_mail ())
 		return;
 
 	/* Take care not to unnecessarily load the mail shell view. */
@@ -312,7 +333,7 @@ mail_shell_backend_handle_email_uri_cb (gchar *folder_uri,
                                         CamelFolder *folder,
                                         gpointer user_data)
 {
-	EMailShellBackend *mail_shell_backend = user_data;
+	EShellBackend *shell_backend = user_data;
 	CamelURL *url = user_data;
 	const gchar *forward;
 	const gchar *reply;
@@ -358,7 +379,7 @@ mail_shell_backend_handle_email_uri_cb (gchar *folder_uri,
 		GtkWidget *browser;
 
 		/* FIXME Should pass in the shell module. */
-		browser = e_mail_browser_new (mail_shell_backend);
+		browser = e_mail_browser_new (shell_backend);
 		e_mail_reader_set_folder (
 			E_MAIL_READER (browser), folder, folder_uri);
 		e_mail_reader_set_message (
@@ -378,7 +399,7 @@ mail_shell_backend_handle_uri_cb (EShell *shell,
 	gboolean handled = TRUE;
 
 	if (g_str_has_prefix (uri, "mailto:")) {
-		if (em_utils_check_user_can_send_mail (NULL))
+		if (em_utils_check_user_can_send_mail ())
 			em_utils_compose_new_message_with_mailto (uri, NULL);
 
 	} else if (g_str_has_prefix (uri, "email:")) {
@@ -579,7 +600,7 @@ mail_shell_backend_constructed (GObject *object)
 	shell = e_shell_backend_get_shell (shell_backend);
 
 	/* This also initializes Camel, so it needs to happen early. */
-	mail_session_init (E_MAIL_SHELL_BACKEND (shell_backend));
+	mail_session_init (shell_backend);
 
 	mail_shell_backend_init_hooks ();
 	mail_shell_backend_init_importers ();
diff --git a/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 4bc1a36706..4bc1a36706 100644
--- a/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
diff --git a/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index b801093116..b801093116 100644
--- a/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
diff --git a/mail/e-mail-shell-content.h b/modules/mail/e-mail-shell-content.h
index 57d2438705..57d2438705 100644
--- a/mail/e-mail-shell-content.h
+++ b/modules/mail/e-mail-shell-content.h
diff --git a/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index 2158580bf9..2158580bf9 100644
--- a/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
diff --git a/mail/e-mail-shell-migrate.h b/modules/mail/e-mail-shell-migrate.h
index 8f3057ec0d..8f3057ec0d 100644
--- a/mail/e-mail-shell-migrate.h
+++ b/modules/mail/e-mail-shell-migrate.h
diff --git a/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 8237924e3c..8237924e3c 100644
--- a/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
diff --git a/mail/e-mail-shell-settings.h b/modules/mail/e-mail-shell-settings.h
index 4267fd8a60..4267fd8a60 100644
--- a/mail/e-mail-shell-settings.h
+++ b/modules/mail/e-mail-shell-settings.h
diff --git a/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 2e5dffcb96..2e5dffcb96 100644
--- a/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
diff --git a/mail/e-mail-shell-sidebar.h b/modules/mail/e-mail-shell-sidebar.h
index 10a2ff6a2a..10a2ff6a2a 100644
--- a/mail/e-mail-shell-sidebar.h
+++ b/modules/mail/e-mail-shell-sidebar.h
diff --git a/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 25e7d80da3..25e7d80da3 100644
--- a/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
diff --git a/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index 2a05582df8..2a05582df8 100644
--- a/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
diff --git a/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index f3b3b5a513..f3b3b5a513 100644
--- a/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
diff --git a/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 988d494219..988d494219 100644
--- a/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
diff --git a/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 8d8b4aa2b3..8d8b4aa2b3 100644
--- a/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
diff --git a/mail/e-mail-shell-view.h b/modules/mail/e-mail-shell-view.h
index d20bde74a6..d20bde74a6 100644
--- a/mail/e-mail-shell-view.h
+++ b/modules/mail/e-mail-shell-view.h
diff --git a/mail/em-account-editor.c b/modules/mail/em-account-editor.c
index 4ae929513e..188a2d475f 100644
--- a/mail/em-account-editor.c
+++ b/modules/mail/em-account-editor.c
@@ -51,12 +51,12 @@
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 
-#include <e-util/e-signature-list.h>
-
 #include "e-util/e-error.h"
 #include "e-util/e-account-utils.h"
+#include "e-util/e-signature-list.h"
 #include "e-util/e-signature-utils.h"
 #include "e-util/e-util-private.h"
+#include "misc/e-signature-editor.h"
 
 #include "e-mail-local.h"
 #include "em-config.h"
@@ -64,7 +64,6 @@
 #include "em-account-editor.h"
 #include "mail-session.h"
 #include "mail-send-recv.h"
-#include "e-signature-editor.h"
 #include "em-utils.h"
 #include "em-composer-prefs.h"
 #include "mail-config.h"
diff --git a/mail/em-account-editor.h b/modules/mail/em-account-editor.h
index d8d96f58f0..d8d96f58f0 100644
--- a/mail/em-account-editor.h
+++ b/modules/mail/em-account-editor.h
diff --git a/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index f2c646d5ed..f2c646d5ed 100644
--- a/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
diff --git a/mail/em-account-prefs.h b/modules/mail/em-account-prefs.h
index 82df8fa941..82df8fa941 100644
--- a/mail/em-account-prefs.h
+++ b/modules/mail/em-account-prefs.h
diff --git a/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index d87bb37ffb..18dae567ca 100644
--- a/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -48,13 +48,13 @@
 #include <editor/gtkhtml-spell-language.h>
 
 #include "misc/e-charset-picker.h"
+#include "misc/e-signature-editor.h"
 #include "misc/e-signature-manager.h"
 #include "misc/e-signature-preview.h"
 #include "e-util/e-error.h"
 #include "e-util/e-util-private.h"
 
 #include "mail-config.h"
-#include "e-signature-editor.h"
 #include "em-config.h"
 
 static gpointer parent_class;
diff --git a/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h
index 3b848f1a2f..3b848f1a2f 100644
--- a/mail/em-composer-prefs.h
+++ b/modules/mail/em-composer-prefs.h
diff --git a/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index fa450dc2ee..fa450dc2ee 100644
--- a/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
diff --git a/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index b33e620392..b33e620392 100644
--- a/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
diff --git a/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index e530d4d076..e530d4d076 100644
--- a/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
diff --git a/mail/em-network-prefs.h b/modules/mail/em-network-prefs.h
index 057247b750..057247b750 100644
--- a/mail/em-network-prefs.h
+++ b/modules/mail/em-network-prefs.h
diff --git a/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c
index 97bc953c41..97bc953c41 100644
--- a/mail/evolution-module-mail.c
+++ b/modules/mail/evolution-module-mail.c
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index edfe538d3a..b3c1799455 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -28,7 +28,7 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/mail/libevolution-mail.la \
 	$(EVOLUTION_MAIL_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index c17876d622..a8f591ec1f 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -10,9 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-audio-inline.la
 
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
 liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_audio_inline_la_LIBADD =				\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
-	$(GSTREAMER_LIBS)					\
+liborg_gnome_audio_inline_la_LIBADD =			\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(GSTREAMER_LIBS)				\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-audio-inline.eplug.xml
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index afa24a0d71..9d51b4d89d 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -11,9 +11,9 @@ plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la
 liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
 liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_bogo_junk_plugin_la_LIBADD =	\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(EVOLUTION_MAIL_LIBS)			\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 76234e3533..b5ec612403 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -33,7 +33,7 @@ liborg_gnome_external_editor_la_LIBADD = 			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la 		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/mail/libevolution-mail.la		\
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index cf7dbd79c9..e6b6559c63 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -14,10 +14,10 @@ plugin_LTLIBRARIES = liborg-gnome-imap-features.la
 liborg_gnome_imap_features_la_SOURCES = 	\
 	imap-headers.c	
 
-liborg_gnome_imap_features_la_LIBADD=				\
-	$(top_builddir)/e-util/libeutil.la 			\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
-	$(EVOLUTION_MAIL_LIBS)					
+liborg_gnome_imap_features_la_LIBADD=			\
+	$(top_builddir)/e-util/libeutil.la 		\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 
 liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 629697f7d1..2055cce572 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -18,10 +18,10 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = 	\
 	-module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_mail_notification_la_LIBADD = 			\
-	$(LIBNOTIFY_LIBS)					\
-	$(top_builddir)/e-util/libeutil.la 			\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
+liborg_gnome_mail_notification_la_LIBADD = 		\
+	$(LIBNOTIFY_LIBS)				\
+	$(top_builddir)/e-util/libeutil.la 		\
+	$(top_builddir)/mail/libevolution-mail.la	\
 	$(GNOME_PLATFORM_LIBS)
 
 if ENABLE_DBUS
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index f3db1bdc6c..f1bbbcbb18 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -11,8 +11,8 @@ liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c
 liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_mark_all_read_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
-	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/shell/libeshell.la		\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index 7d82ad396d..d7ba3e7d51 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -12,9 +12,9 @@ liborg_gnome_sa_junk_plugin_la_SOURCES = em-junk-filter.c
 liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_sa_junk_plugin_la_LIBADD =	\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(EVOLUTION_MAIL_LIBS)			\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(EVOLUTION_MAIL_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
 BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index f3c20d1c59..df143ce9d4 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -11,7 +11,7 @@ plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
 liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
 liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_vcard_inline_la_LIBADD =	\
-	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la		\
 	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la		\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6cc1741ac3..b5d94bc34c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,17 +2,6 @@
 # Please keep this list in alphabetic order.
 addressbook/addressbook.error.xml
 addressbook/conduit/address-conduit.c
-addressbook/gui/component/addressbook-config.c
-addressbook/gui/component/apps_evolution_addressbook.schemas.in
-addressbook/gui/component/autocompletion-config.c
-addressbook/gui/component/e-book-shell-backend.c
-addressbook/gui/component/e-book-shell-content.c
-addressbook/gui/component/e-book-shell-migrate.c
-addressbook/gui/component/e-book-shell-sidebar.c
-addressbook/gui/component/e-book-shell-view-actions.c
-addressbook/gui/component/e-book-shell-view.c
-addressbook/gui/component/eab-composer-util.c
-addressbook/gui/component/ldap-config.glade
 addressbook/gui/contact-editor/contact-editor.glade
 addressbook/gui/contact-editor/e-contact-editor-fullname.c
 addressbook/gui/contact-editor/e-contact-editor.c
@@ -24,9 +13,6 @@ addressbook/gui/contact-list-editor/e-contact-list-editor.c
 addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
 addressbook/gui/merging/eab-contact-duplicate-detected.glade
 addressbook/gui/merging/eab-contact-merging.c
-addressbook/gui/widgets/a11y/ea-addressbook-view.c
-addressbook/gui/widgets/a11y/ea-minicard-view.c
-addressbook/gui/widgets/a11y/ea-minicard.c
 addressbook/gui/widgets/addresstypes.xml
 addressbook/gui/widgets/e-addressbook-model.c
 addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -37,6 +23,9 @@ addressbook/gui/widgets/e-minicard-label.c
 addressbook/gui/widgets/e-minicard-view-widget.c
 addressbook/gui/widgets/e-minicard-view.c
 addressbook/gui/widgets/e-minicard.c
+addressbook/gui/widgets/ea-addressbook-view.c
+addressbook/gui/widgets/ea-minicard-view.c
+addressbook/gui/widgets/ea-minicard.c
 addressbook/gui/widgets/eab-contact-display.c
 addressbook/gui/widgets/eab-gui-util.c
 addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -136,29 +125,6 @@ calendar/gui/print.c
 calendar/gui/tasktypes.xml
 calendar/gui/weekday-picker.c
 calendar/importers/icalendar-importer.c
-calendar/module/e-cal-shell-backend.c
-calendar/module/e-cal-shell-content.c
-calendar/module/e-cal-shell-migrate.c
-calendar/module/e-cal-shell-sidebar.c
-calendar/module/e-cal-shell-view-actions.c
-calendar/module/e-cal-shell-view-memopad.c
-calendar/module/e-cal-shell-view-private.c
-calendar/module/e-cal-shell-view-taskpad.c
-calendar/module/e-cal-shell-view.c
-calendar/module/e-memo-shell-backend.c
-calendar/module/e-memo-shell-content.c
-calendar/module/e-memo-shell-migrate.c
-calendar/module/e-memo-shell-sidebar.c
-calendar/module/e-memo-shell-view-actions.c
-calendar/module/e-memo-shell-view-private.c
-calendar/module/e-memo-shell-view.c
-calendar/module/e-task-shell-backend.c
-calendar/module/e-task-shell-content.c
-calendar/module/e-task-shell-migrate.c
-calendar/module/e-task-shell-sidebar.c
-calendar/module/e-task-shell-view-actions.c
-calendar/module/e-task-shell-view-private.c
-calendar/module/e-task-shell-view.c
 calendar/zones.h
 composer/e-composer-actions.c
 composer/e-composer-autosave.c
@@ -194,7 +160,6 @@ filter/filter.error.xml
 filter/filter.glade
 filter/rule-context.c
 filter/rule-editor.c
-mail/e-attachment-handler-mail.c
 mail/e-mail-attachment-bar.c
 mail/e-mail-browser.c
 mail/e-mail-display.c
@@ -202,18 +167,11 @@ mail/e-mail-label-dialog.c
 mail/e-mail-label-list-store.c
 mail/e-mail-label-manager.c
 mail/e-mail-label-tree-view.c
+mail/e-mail-local.c
 mail/e-mail-reader-utils.c
 mail/e-mail-reader.c
 mail/e-mail-search-bar.c
-mail/e-mail-shell-backend.c
-mail/e-mail-shell-content.c
-mail/e-mail-shell-migrate.c
-mail/e-mail-shell-view-actions.c
-mail/e-mail-shell-view-private.c
-mail/e-mail-shell-view.c
-mail/em-account-editor.c
-mail/em-account-prefs.c
-mail/em-composer-prefs.c
+mail/e-mail-store.c
 mail/em-composer-utils.c
 mail/em-filter-editor.c
 mail/em-filter-folder-element.c
@@ -229,7 +187,6 @@ mail/em-format-html-display.c
 mail/em-format-html-print.c
 mail/em-format-html.c
 mail/em-junk-hook.c
-mail/em-mailer-prefs.c
 mail/em-popup.c
 mail/em-subscribe-editor.c
 mail/em-utils.c
@@ -257,6 +214,51 @@ mail/message-list.etspec
 mail/message-tag-editor.c
 mail/message-tag-followup.c
 mail/searchtypes.xml
+modules/addressbook/addressbook-config.c
+modules/addressbook/apps_evolution_addressbook.schemas.in
+modules/addressbook/autocompletion-config.c
+modules/addressbook/e-book-shell-backend.c
+modules/addressbook/e-book-shell-content.c
+modules/addressbook/e-book-shell-migrate.c
+modules/addressbook/e-book-shell-sidebar.c
+modules/addressbook/e-book-shell-view-actions.c
+modules/addressbook/e-book-shell-view.c
+modules/addressbook/eab-composer-util.c
+modules/addressbook/ldap-config.glade
+modules/calendar/e-cal-shell-backend.c
+modules/calendar/e-cal-shell-content.c
+modules/calendar/e-cal-shell-migrate.c
+modules/calendar/e-cal-shell-sidebar.c
+modules/calendar/e-cal-shell-view-actions.c
+modules/calendar/e-cal-shell-view-memopad.c
+modules/calendar/e-cal-shell-view-private.c
+modules/calendar/e-cal-shell-view-taskpad.c
+modules/calendar/e-cal-shell-view.c
+modules/calendar/e-memo-shell-backend.c
+modules/calendar/e-memo-shell-content.c
+modules/calendar/e-memo-shell-migrate.c
+modules/calendar/e-memo-shell-sidebar.c
+modules/calendar/e-memo-shell-view-actions.c
+modules/calendar/e-memo-shell-view-private.c
+modules/calendar/e-memo-shell-view.c
+modules/calendar/e-task-shell-backend.c
+modules/calendar/e-task-shell-content.c
+modules/calendar/e-task-shell-migrate.c
+modules/calendar/e-task-shell-sidebar.c
+modules/calendar/e-task-shell-view-actions.c
+modules/calendar/e-task-shell-view-private.c
+modules/calendar/e-task-shell-view.c
+modules/mail/e-attachment-handler-mail.c
+modules/mail/e-mail-shell-backend.c
+modules/mail/e-mail-shell-content.c
+modules/mail/e-mail-shell-migrate.c
+modules/mail/e-mail-shell-view-actions.c
+modules/mail/e-mail-shell-view-private.c
+modules/mail/e-mail-shell-view.c
+modules/mail/em-account-editor.c
+modules/mail/em-account-prefs.c
+modules/mail/em-composer-prefs.c
+modules/mail/em-mailer-prefs.c
 plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
 plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
 plugins/attachment-reminder/attachment-reminder.c
@@ -464,7 +466,6 @@ widgets/menus/gal-view-instance-save-as-dialog.glade
 widgets/menus/gal-view-instance.c
 widgets/menus/gal-view-new-dialog.c
 widgets/menus/gal-view-new-dialog.glade
-widgets/misc/a11y/ea-calendar-item.c
 widgets/misc/e-account-manager.c
 widgets/misc/e-account-tree-view.c
 widgets/misc/e-action-combo-box.c
@@ -500,13 +501,7 @@ widgets/misc/e-signature-editor.c
 widgets/misc/e-signature-manager.c
 widgets/misc/e-signature-script-dialog.c
 widgets/misc/e-url-entry.c
-widgets/table/a11y/gal-a11y-e-cell-popup.c
-widgets/table/a11y/gal-a11y-e-cell-text.c
-widgets/table/a11y/gal-a11y-e-cell-toggle.c
-widgets/table/a11y/gal-a11y-e-cell-tree.c
-widgets/table/a11y/gal-a11y-e-cell.c
-widgets/table/a11y/gal-a11y-e-table-click-to-add.c
-widgets/table/a11y/gal-a11y-e-table-column-header.c
+widgets/misc/ea-calendar-item.c
 widgets/table/e-cell-combo.c
 widgets/table/e-cell-date-edit.c
 widgets/table/e-cell-date.c
@@ -533,4 +528,11 @@ widgets/table/e-table.c
 widgets/table/e-tree-scrolled.c
 widgets/table/e-tree-selection-model.c
 widgets/table/e-tree.c
+widgets/table/gal-a11y-e-cell-popup.c
+widgets/table/gal-a11y-e-cell-text.c
+widgets/table/gal-a11y-e-cell-toggle.c
+widgets/table/gal-a11y-e-cell-tree.c
+widgets/table/gal-a11y-e-cell.c
+widgets/table/gal-a11y-e-table-click-to-add.c
+widgets/table/gal-a11y-e-table-column-header.c
 widgets/text/e-text.c
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index cbbd283fb2..c7123d6977 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -84,9 +84,9 @@ widgetsinclude_HEADERS =			\
 	e-spinner.h				\
 	e-timeout-activity.h			\
 	e-url-entry.h				\
-	a11y/ea-calendar-cell.h			\
-	a11y/ea-calendar-item.h			\
-	a11y/ea-widgets.h
+	ea-calendar-cell.h			\
+	ea-calendar-item.h			\
+	ea-widgets.h
 
 libemiscwidgets_la_SOURCES =			\
 	$(widgetsinclude_HEADERS)		\
@@ -145,9 +145,9 @@ libemiscwidgets_la_SOURCES =			\
 	e-signature-tree-view.c			\
 	e-timeout-activity.c			\
 	e-url-entry.c				\
-	a11y/ea-calendar-cell.c			\
-	a11y/ea-calendar-item.c			\
-	a11y/ea-widgets.c
+	ea-calendar-cell.c			\
+	ea-calendar-item.c			\
+	ea-widgets.c
 
 libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 9c9bd94b15..890355620b 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "e-calendar-item.h"
-#include "a11y/ea-widgets.h"
+#include "ea-widgets.h"
 
 #include <time.h>
 #include <string.h>
diff --git a/widgets/misc/a11y/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index af9471c5af..af9471c5af 100644
--- a/widgets/misc/a11y/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
diff --git a/widgets/misc/a11y/ea-calendar-cell.h b/widgets/misc/ea-calendar-cell.h
index fa68fdca55..fa68fdca55 100644
--- a/widgets/misc/a11y/ea-calendar-cell.h
+++ b/widgets/misc/ea-calendar-cell.h
diff --git a/widgets/misc/a11y/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index 56a01b510b..56a01b510b 100644
--- a/widgets/misc/a11y/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
diff --git a/widgets/misc/a11y/ea-calendar-item.h b/widgets/misc/ea-calendar-item.h
index 36cc671a3b..36cc671a3b 100644
--- a/widgets/misc/a11y/ea-calendar-item.h
+++ b/widgets/misc/ea-calendar-item.h
diff --git a/widgets/misc/a11y/ea-widgets.c b/widgets/misc/ea-widgets.c
index 9deede235e..9deede235e 100644
--- a/widgets/misc/a11y/ea-widgets.c
+++ b/widgets/misc/ea-widgets.c
diff --git a/widgets/misc/a11y/ea-widgets.h b/widgets/misc/ea-widgets.h
index 495222ae05..495222ae05 100644
--- a/widgets/misc/a11y/ea-widgets.h
+++ b/widgets/misc/ea-widgets.h
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index a53b249ce4..c4fc858a74 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -73,22 +73,22 @@ libetable_la_SOURCES = 				\
 	e-tree-sorted.c				\
 	e-tree-table-adapter.c			\
 	e-tree.c				\
-	a11y/gal-a11y-e-cell.c			\
-	a11y/gal-a11y-e-cell-popup.c		\
-	a11y/gal-a11y-e-cell-registry.c		\
-	a11y/gal-a11y-e-cell-text.c		\
-	a11y/gal-a11y-e-cell-toggle.c		\
-	a11y/gal-a11y-e-cell-tree.c		\
-	a11y/gal-a11y-e-cell-vbox.c		\
-	a11y/gal-a11y-e-table.c			\
-	a11y/gal-a11y-e-table-click-to-add.c	\
-	a11y/gal-a11y-e-table-click-to-add-factory.c	\
-	a11y/gal-a11y-e-table-column-header.c	\
-	a11y/gal-a11y-e-table-factory.c		\
-	a11y/gal-a11y-e-table-item.c		\
-	a11y/gal-a11y-e-table-item-factory.c	\
-	a11y/gal-a11y-e-tree.c			\
-	a11y/gal-a11y-e-tree-factory.c
+	gal-a11y-e-cell.c			\
+	gal-a11y-e-cell-popup.c			\
+	gal-a11y-e-cell-registry.c		\
+	gal-a11y-e-cell-text.c			\
+	gal-a11y-e-cell-toggle.c		\
+	gal-a11y-e-cell-tree.c			\
+	gal-a11y-e-cell-vbox.c			\
+	gal-a11y-e-table.c			\
+	gal-a11y-e-table-click-to-add.c		\
+	gal-a11y-e-table-click-to-add-factory.c	\
+	gal-a11y-e-table-column-header.c	\
+	gal-a11y-e-table-factory.c		\
+	gal-a11y-e-table-item.c			\
+	gal-a11y-e-table-item-factory.c		\
+	gal-a11y-e-tree.c			\
+	gal-a11y-e-tree-factory.c
 
 libetableincludedir = $(privincludedir)/table
 
@@ -155,22 +155,22 @@ libetableinclude_HEADERS = 			\
 	e-tree-sorted.h				\
 	e-tree-table-adapter.h			\
 	e-tree.h				\
-	a11y/gal-a11y-e-cell.h			\
-	a11y/gal-a11y-e-cell-popup.h		\
-	a11y/gal-a11y-e-cell-registry.h		\
-	a11y/gal-a11y-e-cell-text.h		\
-	a11y/gal-a11y-e-cell-toggle.h		\
-	a11y/gal-a11y-e-cell-tree.h		\
-	a11y/gal-a11y-e-cell-vbox.h		\
-	a11y/gal-a11y-e-table.h			\
-	a11y/gal-a11y-e-table-click-to-add.h	\
-	a11y/gal-a11y-e-table-click-to-add-factory.h	\
-	a11y/gal-a11y-e-table-column-header.h	\
-	a11y/gal-a11y-e-table-factory.h		\
-	a11y/gal-a11y-e-table-item.h		\
-	a11y/gal-a11y-e-table-item-factory.h	\
-	a11y/gal-a11y-e-tree.h			\
-	a11y/gal-a11y-e-tree-factory.h
+	gal-a11y-e-cell.h			\
+	gal-a11y-e-cell-popup.h			\
+	gal-a11y-e-cell-registry.h		\
+	gal-a11y-e-cell-text.h			\
+	gal-a11y-e-cell-toggle.h		\
+	gal-a11y-e-cell-tree.h			\
+	gal-a11y-e-cell-vbox.h			\
+	gal-a11y-e-table.h			\
+	gal-a11y-e-table-click-to-add.h		\
+	gal-a11y-e-table-click-to-add-factory.h	\
+	gal-a11y-e-table-column-header.h	\
+	gal-a11y-e-table-factory.h		\
+	gal-a11y-e-table-item.h			\
+	gal-a11y-e-table-item-factory.h		\
+	gal-a11y-e-tree.h			\
+	gal-a11y-e-tree-factory.h
 
 libetable_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 26897709c2..298f67db82 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -33,8 +33,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "a11y/gal-a11y-e-cell-popup.h"
-#include "a11y/gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-popup.h"
+#include "gal-a11y-e-cell-registry.h"
 #include "e-util/e-util.h"
 
 #include "e-cell-popup.h"
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index c1d5dc88bb..78065025f3 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -45,8 +45,8 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-cell-registry.h"
-#include "a11y/gal-a11y-e-cell-text.h"
+#include "gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-text.h"
 #include "text/e-text.h"
 #include <glib/gi18n.h>
 #include "e-util/e-text-event-processor.h"
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index baad2027d5..02a7425e41 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -28,8 +28,8 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include "a11y/gal-a11y-e-cell-toggle.h"
-#include "a11y/gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-toggle.h"
+#include "gal-a11y-e-cell-registry.h"
 #include "e-util/e-util.h"
 #include "misc/e-hsv-utils.h"
 
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index c3ecca939b..2156aa9917 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -38,8 +38,8 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include "a11y/gal-a11y-e-cell-registry.h"
-#include "a11y/gal-a11y-e-cell-tree.h"
+#include "gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-tree.h"
 #include "e-util/e-util.h"
 
 #include "e-cell-tree.h"
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 30bb9027a9..210cc84139 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -29,8 +29,8 @@
 
 #include <gtk/gtk.h>
 
-#include "a11y/gal-a11y-e-cell-registry.h"
-#include "a11y/gal-a11y-e-cell-vbox.h"
+#include "gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-vbox.h"
 #include "e-util/e-util.h"
 
 #include "e-cell-vbox.h"
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 99a290dea2..d2d1534611 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -29,7 +29,7 @@
 #include <libgnomecanvas/gnome-canvas-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "a11y/gal-a11y-e-table-click-to-add.h"
+#include "gal-a11y-e-table-click-to-add.h"
 #include "text/e-text.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index c5cfa1878f..7448a355f7 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -36,8 +36,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "a11y/gal-a11y-e-table-item-factory.h"
-#include "a11y/gal-a11y-e-table-item.h"
+#include "gal-a11y-e-table-item-factory.h"
+#include "gal-a11y-e-table-item.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 7f756d95a4..bf18fbb224 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -36,7 +36,7 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-table.h"
+#include "gal-a11y-e-table.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 8124a59c64..dd07b2b536 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-tree.h"
+#include "gal-a11y-e-tree.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/a11y/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index 141ce172a4..141ce172a4 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-popup.h b/widgets/table/gal-a11y-e-cell-popup.h
index 76ad0ffec9..641d345308 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-popup.h
+++ b/widgets/table/gal-a11y-e-cell-popup.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 #include <table/e-table-item.h>
-#include <table/a11y/gal-a11y-e-cell.h>
+#include <table/gal-a11y-e-cell.h>
 #include <atk/atkgobjectaccessible.h>
 
 #define GAL_A11Y_TYPE_E_CELL_POPUP            (gal_a11y_e_cell_popup_get_type ())
diff --git a/widgets/table/a11y/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index 9dc9598608..9dc9598608 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-registry.h b/widgets/table/gal-a11y-e-cell-registry.h
index 0620fd1b9c..0620fd1b9c 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-registry.h
+++ b/widgets/table/gal-a11y-e-cell-registry.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell-text.c b/widgets/table/gal-a11y-e-cell-text.c
index 77823b0a7c..77823b0a7c 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-text.c
+++ b/widgets/table/gal-a11y-e-cell-text.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-text.h b/widgets/table/gal-a11y-e-cell-text.h
index 1a378a459c..bb400b38e3 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-text.h
+++ b/widgets/table/gal-a11y-e-cell-text.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <table/e-table-item.h>
 #include <table/e-cell-text.h>
-#include <table/a11y/gal-a11y-e-cell.h>
+#include <table/gal-a11y-e-cell.h>
 
 #define GAL_A11Y_TYPE_E_CELL_TEXT            (gal_a11y_e_cell_text_get_type ())
 #define GAL_A11Y_E_CELL_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText))
diff --git a/widgets/table/a11y/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index df687f4005..df687f4005 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-toggle.h b/widgets/table/gal-a11y-e-cell-toggle.h
index 8e9b4def08..8e9b4def08 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-toggle.h
+++ b/widgets/table/gal-a11y-e-cell-toggle.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index aaf490c726..aaf490c726 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-tree.h b/widgets/table/gal-a11y-e-cell-tree.h
index 497590b351..497590b351 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-tree.h
+++ b/widgets/table/gal-a11y-e-cell-tree.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index b3f92a695a..b3f92a695a 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-vbox.h b/widgets/table/gal-a11y-e-cell-vbox.h
index 657cb5d9a5..657cb5d9a5 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-vbox.h
+++ b/widgets/table/gal-a11y-e-cell-vbox.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index e09b5456d9..e09b5456d9 100644
--- a/widgets/table/a11y/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell.h b/widgets/table/gal-a11y-e-cell.h
index c61e5e2d22..c61e5e2d22 100644
--- a/widgets/table/a11y/gal-a11y-e-cell.h
+++ b/widgets/table/gal-a11y-e-cell.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index 0ebb3c4621..0ebb3c4621 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.h b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
index 9f249f0178..9f249f0178 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 8a8fe56796..8a8fe56796 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add.h b/widgets/table/gal-a11y-e-table-click-to-add.h
index 17d6940d08..17d6940d08 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index 41e6ab0fca..41e6ab0fca 100644
--- a/widgets/table/a11y/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-column-header.h b/widgets/table/gal-a11y-e-table-column-header.h
index d0b1ff5aeb..d0b1ff5aeb 100644
--- a/widgets/table/a11y/gal-a11y-e-table-column-header.h
+++ b/widgets/table/gal-a11y-e-table-column-header.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index f459f3b67c..f459f3b67c 100644
--- a/widgets/table/a11y/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-factory.h b/widgets/table/gal-a11y-e-table-factory.h
index 3439cf0bdc..3439cf0bdc 100644
--- a/widgets/table/a11y/gal-a11y-e-table-factory.h
+++ b/widgets/table/gal-a11y-e-table-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index fa14652788..fa14652788 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-item-factory.h b/widgets/table/gal-a11y-e-table-item-factory.h
index f27c491a4d..f27c491a4d 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item-factory.h
+++ b/widgets/table/gal-a11y-e-table-item-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 561b9a84d6..561b9a84d6 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.h b/widgets/table/gal-a11y-e-table-item.h
index 27d6a8244b..27d6a8244b 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.h
+++ b/widgets/table/gal-a11y-e-table-item.h
diff --git a/widgets/table/a11y/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index bf75227af4..bf75227af4 100644
--- a/widgets/table/a11y/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
diff --git a/widgets/table/a11y/gal-a11y-e-table.h b/widgets/table/gal-a11y-e-table.h
index d8f972df81..d8f972df81 100644
--- a/widgets/table/a11y/gal-a11y-e-table.h
+++ b/widgets/table/gal-a11y-e-table.h
diff --git a/widgets/table/a11y/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index 8dc06e2936..8dc06e2936 100644
--- a/widgets/table/a11y/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-tree-factory.h b/widgets/table/gal-a11y-e-tree-factory.h
index 3d97c7a3b1..3d97c7a3b1 100644
--- a/widgets/table/a11y/gal-a11y-e-tree-factory.h
+++ b/widgets/table/gal-a11y-e-tree-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index 879b517aab..879b517aab 100644
--- a/widgets/table/a11y/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
diff --git a/widgets/table/a11y/gal-a11y-e-tree.h b/widgets/table/gal-a11y-e-tree.h
index d2aa8a0d2a..d2aa8a0d2a 100644
--- a/widgets/table/a11y/gal-a11y-e-tree.h
+++ b/widgets/table/gal-a11y-e-tree.h
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index e035d8714d..70adbfec39 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -14,8 +14,8 @@ libetext_la_SOURCES =				\
 	e-text.c				\
 	e-reflow.c				\
 	e-reflow-model.c			\
-	a11y/gal-a11y-e-text-factory.c		\
-	a11y/gal-a11y-e-text.c
+	gal-a11y-e-text-factory.c		\
+	gal-a11y-e-text.c
 
 libetextincludedir = $(privincludedir)/text
 
@@ -25,8 +25,8 @@ libetextinclude_HEADERS = 			\
 	e-text.h				\
 	e-reflow.h				\
 	e-reflow-model.h			\
-	a11y/gal-a11y-e-text-factory.h		\
-	a11y/gal-a11y-e-text.h
+	gal-a11y-e-text-factory.h		\
+	gal-a11y-e-text.h
 
 libetext_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index f6371aa551..7c542d8f5f 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -46,7 +46,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-text.h"
+#include "gal-a11y-e-text.h"
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
 #include "e-util/e-unicode.h"
diff --git a/widgets/text/a11y/gal-a11y-e-text-factory.c b/widgets/text/gal-a11y-e-text-factory.c
index 2df9241014..2df9241014 100644
--- a/widgets/text/a11y/gal-a11y-e-text-factory.c
+++ b/widgets/text/gal-a11y-e-text-factory.c
diff --git a/widgets/text/a11y/gal-a11y-e-text-factory.h b/widgets/text/gal-a11y-e-text-factory.h
index df7638f64f..df7638f64f 100644
--- a/widgets/text/a11y/gal-a11y-e-text-factory.h
+++ b/widgets/text/gal-a11y-e-text-factory.h
diff --git a/widgets/text/a11y/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index 99fb4e8a94..99fb4e8a94 100644
--- a/widgets/text/a11y/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
diff --git a/widgets/text/a11y/gal-a11y-e-text.h b/widgets/text/gal-a11y-e-text.h
index 6a5bb80de0..6a5bb80de0 100644
--- a/widgets/text/a11y/gal-a11y-e-text.h
+++ b/widgets/text/gal-a11y-e-text.h
diff --git a/win32/Makefile.am b/win32/Makefile.am
index d2b25958c0..7720d56543 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST =				\
 	libevolution-addressbook.def	\
 	libevolution-calendar.def	\
 	libevolution-mail.def		\
-	libevolution-mail-shared.def		\
 	libfilter.def
 
 if OS_WIN32
@@ -17,7 +16,6 @@ BOOTSTRAP_LIBS =			\
 	libevolution-addressbook.la	\
 	libevolution-calendar.la	\
 	libevolution-mail.la		\
-	libevolution-mail-shared.la		\
 	libfilter.la
 endif
 
@@ -58,11 +56,6 @@ libevolution-mail.la: dummy.la libevolution-mail.def
 	mkdir -p .libs
 	$(DLLTOOL) --output-lib=.libs/libevolution-mail.dll.a --dllname=libevolution-mail.dll --input-def=libevolution-mail.def
 
-libevolution-mail-shared.la: dummy.la libevolution-mail-shared.def
-	sed -e s!%DLL%!libevolution-mail-shared-0! -e s!%LIB%!libevolution-mail-shared! -e s!%PFX%!$(prefix)! <dummy.la >$@
-	mkdir -p .libs
-	$(DLLTOOL) --output-lib=.libs/libevolution-mail-shared.dll.a --dllname=libevolution-mail-shared-0.dll --input-def=libevolution-mail-shared.def
-
 libfilter.la: dummy.la libfilter.def
 	sed -e s!%DLL%!libfilter-0! -e s!%LIB%!libfilter! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs