diff --git a/openlp/core/lib/mailto/LICENSE b/openlp/core/lib/mailto/LICENSE
index 967fbb0f4..d8ab2d8d2 100644
--- a/openlp/core/lib/mailto/LICENSE
+++ b/openlp/core/lib/mailto/LICENSE
@@ -1,23 +1,23 @@
 PSF LICENSE AGREEMENT FOR PYTHON 2.7.1
 
- 1. This LICENSE AGREEMENT is between the Python Software Foundation (“PSF”),
-    and the Individual or Organization (“Licensee”) accessing and otherwise
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
+    and the Individual or Organization ("Licensee") accessing and otherwise
     using Python 2.7.1 software in source or binary form and its associated
     documentation.
  2. Subject to the terms and conditions of this License Agreement, PSF hereby
     grants Licensee a nonexclusive, royalty-free, world-wide license to
     reproduce, analyze, test, perform and/or display publicly, prepare
     derivative works, distribute, and otherwise use Python 2.7.1 alone or in any
-    derivative version, provided, however, that PSF’s License Agreement and
-    PSF’s notice of copyright, i.e., “Copyright © 2001-2010 Python Software
-    Foundation; All Rights Reserved” are retained in Python 2.7.1 alone or in
+    derivative version, provided, however, that PSF's License Agreement and
+    PSF's notice of copyright, i.e., "Copyright (c) 2001-2010 Python Software
+    Foundation; All Rights Reserved" are retained in Python 2.7.1 alone or in
     any derivative version prepared by Licensee.
  3. In the event Licensee prepares a derivative work that is based on or
     incorporates Python 2.7.1 or any part thereof, and wants to make the
     derivative work available to others as provided herein, then Licensee hereby
     agrees to include in any such work a brief summary of the changes made to
     Python 2.7.1.
- 4. PSF is making Python 2.7.1 available to Licensee on an “AS IS” basis. PSF
+ 4. PSF is making Python 2.7.1 available to Licensee on an "AS IS" basis. PSF
     MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
     EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION
     OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
diff --git a/openlp/core/lib/mailto/__init__.py b/openlp/core/lib/mailto/__init__.py
index be7125155..102c4c94a 100644
--- a/openlp/core/lib/mailto/__init__.py
+++ b/openlp/core/lib/mailto/__init__.py
@@ -14,7 +14,7 @@
 # The license text can be found at http://docs.python.org/license.html        #
 #                                                                             #
 # This code is taken from: http://code.activestate.com/recipes/511443         #
-# It is modified to be used in OpenLP (http://openlp.org)                     #
+# Modified for use in OpenLP                                                  #
 ###############################################################################
 
 __version__ = u'1.1'
diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index 22395af90..03bbde764 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -63,27 +63,27 @@ class Ui_ExceptionDialog(object):
         self.exceptionButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
         self.exceptionButtonBox.setObjectName(u'exceptionButtonBox')
         self.exceptionLayout.addWidget(self.exceptionButtonBox)
-        self.saveReportButton = QtGui.QPushButton(exceptionDialog)
-        self.saveReportButton.setIcon(build_icon(u':/general/general_save.png'))
-        self.saveReportButton.setObjectName(u'saveReportButton')
-        self.exceptionButtonBox.addButton(self.saveReportButton,
-            QtGui.QDialogButtonBox.ActionRole)
         self.sendReportButton = QtGui.QPushButton(exceptionDialog)
         self.sendReportButton.setIcon(build_icon(
             u':/general/general_email.png'))
         self.sendReportButton.setObjectName(u'sendReportButton')
         self.exceptionButtonBox.addButton(self.sendReportButton,
             QtGui.QDialogButtonBox.ActionRole)
+        self.saveReportButton = QtGui.QPushButton(exceptionDialog)
+        self.saveReportButton.setIcon(build_icon(u':/general/general_save.png'))
+        self.saveReportButton.setObjectName(u'saveReportButton')
+        self.exceptionButtonBox.addButton(self.saveReportButton,
+            QtGui.QDialogButtonBox.ActionRole)
 
         self.retranslateUi(exceptionDialog)
         QtCore.QObject.connect(self.exceptionButtonBox,
             QtCore.SIGNAL(u'accepted()'), exceptionDialog.accept)
         QtCore.QObject.connect(self.exceptionButtonBox,
             QtCore.SIGNAL(u'rejected()'), exceptionDialog.reject)
-        QtCore.QObject.connect(self.saveReportButton,
-            QtCore.SIGNAL(u'pressed()'), self.onSaveReportButtonPressed)
         QtCore.QObject.connect(self.sendReportButton,
             QtCore.SIGNAL(u'pressed()'), self.onSendReportButtonPressed)
+        QtCore.QObject.connect(self.saveReportButton,
+            QtCore.SIGNAL(u'pressed()'), self.onSaveReportButtonPressed)
         QtCore.QMetaObject.connectSlotsByName(exceptionDialog)
 
     def retranslateUi(self, exceptionDialog):
@@ -95,7 +95,7 @@ class Ui_ExceptionDialog(object):
             'developers, so please e-mail it to bugs@openlp.org, along with a '
             'detailed description of what you were doing when the problem '
             'occurred.'))
-        self.saveReportButton.setText(translate('OpenLP.ExceptionDialog',
-            'Save Report to File'))
         self.sendReportButton.setText(translate('OpenLP.ExceptionDialog',
-            'Send Report Mail'))
+            'Send E-Mail'))
+        self.saveReportButton.setText(translate('OpenLP.ExceptionDialog',
+            'Save to File'))
diff --git a/resources/images/general_email.png b/resources/images/general_email.png
index d1e9f2b64..bb3cab8f3 100644
Binary files a/resources/images/general_email.png and b/resources/images/general_email.png differ