diff --git a/mutt-1.6.2-gpgme_set_sender.patch b/mutt-1.6.2-gpgme_set_sender.patch
new file mode 100644
index 0000000..d3708df
--- /dev/null
+++ b/mutt-1.6.2-gpgme_set_sender.patch
@@ -0,0 +1,38 @@
+---
+ crypt-gpgme.c         |    2 +-
+ crypt-gpgme.h         |    2 +-
+ crypt-mod-pgp-gpgme.c |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- crypt-gpgme.c
++++ crypt-gpgme.c	2016-11-23 10:35:10.336974209 +0000
+@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
+   return verify_sender (h, GPGME_PROTOCOL_CMS);
+ }
+ 
+-void gpgme_set_sender (const char *sender)
++void mutt_gpgme_set_sender (const char *sender)
+ {
+   mutt_error ("[setting sender] mailbox: %s\n", sender);
+   FREE (&current_sender);
+--- crypt-gpgme.h
++++ crypt-gpgme.h	2016-11-23 10:34:54.745294760 +0000
+@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg,
+ 
+ int smime_gpgme_verify_sender (HEADER *h);
+ 
+-void gpgme_set_sender (const char *sender);
++void mutt_gpgme_set_sender (const char *sender);
+ 
+ #endif
+--- crypt-mod-pgp-gpgme.c
++++ crypt-mod-pgp-gpgme.c	2016-11-23 10:35:45.700247187 +0000
+@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
+ 
+ static void crypt_mod_pgp_set_sender (const char *sender)
+ {
+-  gpgme_set_sender (sender);
++  mutt_gpgme_set_sender (sender);
+ }
+ 
+ struct crypt_module_specs crypt_mod_pgp_gpgme =
diff --git a/mutt.changes b/mutt.changes
index 07f7d1f..fc21b55 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 23 10:39:04 UTC 2016 - werner@suse.de
+
+- Add patch mutt-1.6.2-gpgme_set_sender.patch
+  that is avoid name space clash with gpgme_set_sender() from gpgme
+
 -------------------------------------------------------------------
 Wed Nov 23 10:13:49 UTC 2016 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index 2283c5f..d7e1506 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -109,6 +109,8 @@ Patch18:        mutt-1.5.21-mailcap.diff
 Patch19:        bsc907453-CVE-2014-9116-jessie.patch
 # PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream
 Patch20:        COLS-workaround.dif
+# PATCH-FIX-OPENSUSE avoid name space trouble with latest libgppme
+Patch21:        mutt-1.6.2-gpgme_set_sender.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir %{_sysconfdir}
 
@@ -148,6 +150,7 @@ done
 %patch18 -p0 -b .mailcap
 %patch19 -p0 -b .cvw2014.9116
 %patch20 -p0 -b .cols
+%patch21 -p0 -b .ssend
 rm -vf README*.orig
 rm -vf PATCHES*.orig