diff --git a/exo.spec b/exo.spec
index 2e87734..ada9d43 100644
--- a/exo.spec
+++ b/exo.spec
@@ -6,7 +6,7 @@
 
 Name:           exo
 Version:        0.10.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Application library for the Xfce desktop environment
 
 Group:          System Environment/Libraries
@@ -166,6 +166,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Thu Jun 25 2015 Kevin Fenzi <kevin@scrye.com> 0.10.6-3
+- Fix mailtoparse for thunderbird and other cases. Fixes bug #1227021
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/mailtoparse.py b/mailtoparse.py
index 63a621e..e541b10 100644
--- a/mailtoparse.py
+++ b/mailtoparse.py
@@ -68,11 +68,11 @@ mailto = parse_url(raw_mailto)
 to = mailto.get('to', [])
 cc = mailto.get('cc', [])
 bcc = mailto.get('bcc', [])
-subject = mailto.get('subject', '')
+subject = ' '.join(mailto.get('subject', []))
 body = '\n'.join(mailto.get('body', []))
 attachments = mailto.get('attachment',[])
 
-args = []
+args = [binary]
 if style == 'mozilla':
 
     command = "to='" + ','.join(to) + "'"
@@ -175,4 +175,4 @@ posix.execv(binary,args)
 #sys.exit(0)
 #ENDDEBUG
 # something went wrong
-sys.exit(1)
\ No newline at end of file
+sys.exit(1)