Merge di master.

diff --cc configure.ac
index 131ab1676a0a418c767e1cc279aa3d04bc0f366e,a6ee59b97b8d8a72309177a83dc336f750d609b8..9c4ccfa6ee9fc8cff5f18f055983adee3beaeb2a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -30,7 -30,8 +30,9 @@@ AC_PROG_RANLI
  PKG_CHECK_MODULES(SOLIPA, [gobject-2.0 >= 2.24.0
                             glib-2.0 >= 2.24.0
                             libgdaex >= 0.2.2
 +                           camel-provider-1.2 >= 2.32
+                            libgtkform >= 0.1.4
+                            camel-provider-1.2 >= 2.24
                             gtk+-2.0 >= 2.20
                             gio-2.0 >= 2.24])