diff --git a/.gitignore b/.gitignore
index e3866bf..1c28bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ exo-0.3.107.tar.bz2
 /exo-0.10.0.tar.bz2
 /exo-0.10.1.tar.bz2
 /exo-0.10.2.tar.bz2
+/mailtoparse.py
diff --git a/exo.spec b/exo.spec
index ac8ca8a..85d68ae 100644
--- a/exo.spec
+++ b/exo.spec
@@ -6,7 +6,7 @@
 
 Name:           exo
 Version:        0.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application library for the Xfce desktop environment
 
 Group:          System Environment/Libraries
@@ -19,6 +19,9 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}
 # internet-mail icon taken from GNOME, license is LGPLv3
 Source1:        internet-mail-24.png
 Source2:        internet-mail-48.png
+# replace mailto handler with python version
+# https://bugzilla.xfce.org/show_bug.cgi?id=9964
+Source3:        http://skvidal.fedorapeople.org/misc/mailtoparse.py
 Patch1:         exo-0.7.2-remove-xfce-category.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,6 +93,10 @@ done
 install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/internet-mail.png
 install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/internet-mail.png
 
+# replace upstream perl script with python one. 
+rm -f %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1
+install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1
+
 
 %clean
 rm -rf %{buildroot}
@@ -158,6 +165,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Fri May 10 2013 Kevin Fenzi <kevin@scrye.com> 0.10.2-3
+- Replace upstream perl script for mail handler with python version. 
+- https://bugzilla.xfce.org/show_bug.cgi?id=9964
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 7da35b4..d1cfc00 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 5967338f62bcfc456039ca2d4591506f  internet-mail-24.png
 7372d488df90bb3595f27bbde89bd986  internet-mail-48.png
 c70f2a217811bfba2e62f938d4b8f748  exo-0.10.2.tar.bz2
+6bd9473a66ebec909efd3ce8ed817b17  mailtoparse.py