diff --git a/kdepim-4.3.1-kmail-saveAttachments.patch b/kdepim-4.3.1-kmail-saveAttachments.patch
new file mode 100644
index 0000000..907c8ee
--- /dev/null
+++ b/kdepim-4.3.1-kmail-saveAttachments.patch
@@ -0,0 +1,17 @@
+Index: kmail/kmcommands.cpp
+===================================================================
+--- kmail/kmcommands.cpp	(revision 1010021)
++++ kmail/kmcommands.cpp	(working copy)
+@@ -2412,7 +2412,11 @@
+   KUrl url, dirUrl;
+   if ( mAttachmentMap.count() > 1 ) {
+     // get the dir
+-    dirUrl = KFileDialog::getExistingDirectoryUrl( KUrl( "kfiledialog:///saveAttachment" ),
++    QString dummy;
++    KUrl startUrl = KFileWidget::getStartUrl( KUrl( "kfiledialog:///saveAttachment" ), &dummy );
++    if ( !startUrl.isValid() || startUrl.isEmpty() )
++      startUrl = KUrl( KGlobalSettings::documentPath() );
++    dirUrl = KFileDialog::getExistingDirectoryUrl( startUrl,
+                                                    parentWidget(),
+                                                    i18n( "Save Attachments To" ) );
+     if ( !dirUrl.isValid() ) {
diff --git a/kdepim.spec b/kdepim.spec
index 16a747f..c113456 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -6,13 +6,15 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# http://bugzilla.redhat.com/show_bug.cgi?id=496988
+Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,6 +94,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %prep
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
+%patch1 -p0 -b .kmail-saveAttachments
 
 # omit conflict with oxygen-icons, working on a better long-term fix with
 # oxygen folk to get all the icons/temporary stuff out of kdepim
@@ -214,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 11 2009 Lukáš Tinkl <ltinkl@redhat.com> - 4.3.0-3
+- fix kmail default save dir regression (#496988)
+
 * Sat Aug 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.0-2
 - -libs: move designer plugins here
 - %%check: desktop-file-validate