diff -up evolution-data-server-3.8.5/camel/camel-gpg-context.c.prefer-gpg2 evolution-data-server-3.8.5/camel/camel-gpg-context.c

--- evolution-data-server-3.8.5/camel/camel-gpg-context.c.prefer-gpg2	2013-07-23 14:01:51.000000000 +0200

+++ evolution-data-server-3.8.5/camel/camel-gpg-context.c	2014-01-23 15:44:50.535990255 +0100

@@ -456,8 +456,8 @@ gpg_ctx_get_executable_name (void)

 {

 	static gint index = -1;

 	const gchar *names[] = {

-		"gpg",

 		"gpg2",

+		"gpg",

 		NULL

 	};