diff --git a/claws-mail-3.9.2-fancy-save-image.patch b/claws-mail-3.9.2-fancy-save-image.patch
new file mode 100644
index 0000000..bcd84f9
--- /dev/null
+++ b/claws-mail-3.9.2-fancy-save-image.patch
@@ -0,0 +1,24 @@
+diff -Nur claws-mail-3.9.2-orig/src/plugins/fancy/fancy_viewer.c claws-mail-3.9.2/src/plugins/fancy/fancy_viewer.c
+--- claws-mail-3.9.2-orig/src/plugins/fancy/fancy_viewer.c	2013-04-24 11:18:13.000000000 +0200
++++ claws-mail-3.9.2/src/plugins/fancy/fancy_viewer.c	2013-07-13 12:56:29.393174000 +0200
+@@ -683,6 +683,11 @@
+ #endif
+ }
+ 
++static void save_image_cb(GtkWidget *widget, FancyViewer *viewer)
++{
++       debug_print("Not Yet Implemented\n");
++}
++
+ static void open_image_cb(GtkWidget *widget, FancyViewer *viewer)
+ {
+ 	debug_print("Not Yet Implemented\n");
+@@ -767,7 +772,7 @@
+ 
+ 			GtkImageMenuItem *m_simage = GTK_IMAGE_MENU_ITEM(menuitem);
+ 			g_signal_connect(G_OBJECT(m_simage), "activate",
+-					 G_CALLBACK(download_file_cb),
++					 G_CALLBACK(save_image_cb),
+ 					 (gpointer *) viewer);
+ 		}
+ 
diff --git a/claws-mail.spec b/claws-mail.spec
index c358fff..041452e 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -2,7 +2,7 @@
 
 Name:           claws-mail
 Version:        3.9.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Email client and news reader based on GTK+
 Group:          Applications/Internet
 License:        GPLv3+
@@ -11,6 +11,8 @@ Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{versio
 
 # fixed upstream
 Patch0: claws-mail-3.9.2-account-double-free.patch
+# fixed upstream
+Patch1: claws-mail-3.9.2-fancy-save-image.patch
 
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
@@ -263,7 +265,12 @@ Claws Mail. It allows for the use of full perl power in email filters.
 Summary:        PGP plugin for signing and encrypting with Claws Mail
 Group:          Applications/Internet
 Requires:       claws-mail(plugin-api)%{?_isa} = %pluginapi
+%if 0%{?rhel}
 Requires:       pinentry-gui
+%else
+# Fedora: pinentry-qt fails silently #981923
+Requires:       pinentry-gtk
+%endif
 
 %description plugins-pgp
 %{summary}
@@ -346,12 +353,25 @@ exporting of your meetings or all your calendars.
 %prep
 %setup -q
 %patch0 -p1 -b .account-double-free
+%patch1 -p1 -b .fancy-save-image
 
 # guard for pluginapi
 SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
 [ "%pluginapi" == "$SOURCEAPI" ] || exit -1
 
 
+%if 0%{?fedora}
+cat << EOF > README.Fedora
+Firefox and Claws Mail
+
+    Be sure to set the TMPDIR environment variable, so both applications
+    always use the same directory for temporary files. Else the directory
+    would vary depending on whether or not Claws Mail is launched as mailer
+    from within Firefox. [ https://bugzilla.redhat.com/956380 ]
+EOF
+%endif
+
+# temporary note
 rm -rf _tmp_geolocation ; mkdir _tmp_geolocation
 cat << EOF > _tmp_geolocation/README.Fedora
   Cannot build this with libchamplain-gtk and clutter-gtk using gtk3 and
@@ -426,7 +446,7 @@ fi
 
 %files -f claws-mail.lang
 %doc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README RELEASE_NOTES TODO
-%doc _tmp_geolocation/README.Fedora
+%doc README.Fedora
 %doc _tmp_manual/manual
 %{_bindir}/*
 %dir %{_libdir}/claws-mail
@@ -525,6 +545,14 @@ fi
 %{_libdir}/claws-mail/plugins/vcalendar*
 
 %changelog
+* Sat Jul 13 2013 Michael Schwendt <mschwendt@fedoraproject.org>
+- 3.9.2-3
+- for Fedora based builds, require pinentry-gtk instead of the virtual
+  pinentry-gui, because pinentry-qt fails silently (#981923)
+- fix crash in Plugins/Fancy "Save Image As" (#979700)
+- in %%prep section create a README.Fedora %%doc file which mentions
+  setting $TMPDIR when using Claws Mail together with Firefox (#956380)
+
 * Mon Jul  8 2013 Michael Schwendt <mschwendt@fedoraproject.org>
 - 3.9.2-2
 - fix double-free crash in "Preferences for new account" (#981889)