diff --git a/OpenGPSTracker/application/AndroidManifest.xml b/OpenGPSTracker/application/AndroidManifest.xml
index cf966592..feffc370 100644
--- a/OpenGPSTracker/application/AndroidManifest.xml
+++ b/OpenGPSTracker/application/AndroidManifest.xml
@@ -122,7 +122,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:mimeType="text/xml" />
+                <data android:mimeType="application/gpx+xml" />
             </intent-filter>
 
             <meta-data
@@ -236,4 +236,4 @@
         </receiver>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java b/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java
index 7f259b0e..3b563822 100644
--- a/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java
+++ b/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java
@@ -533,6 +533,6 @@ else if (mediaUri.getAuthority().equals("media"))
    @Override
    protected String getContentType()
    {
-      return needsBundling() ? "application/zip" : "text/xml";
+      return needsBundling() ? "application/zip" : "application/gpx+xml";
    }
-}
\ No newline at end of file
+}
diff --git a/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java b/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java
index 09d4569c..63129202 100644
--- a/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java
+++ b/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java
@@ -53,7 +53,7 @@ public GpxSharing(Context context, Uri trackUri, String chosenBaseFileName, bool
    protected void onPostExecute(Uri resultFilename)
    {
       super.onPostExecute(resultFilename);
-      ShareTrack.sendFile(mContext, resultFilename, mContext.getString(R.string.email_gpxbody), getContentType());
+      ShareTrack.sendFile(mContext, resultFilename, getContentType(), mContext.getString(R.string.email_gpxbody));
    }
    
 }
diff --git a/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java b/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java
index 2a35bca1..f708608d 100644
--- a/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java
+++ b/OpenGPSTracker/application/src/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java
@@ -52,7 +52,7 @@ public KmzSharing(Context context, Uri trackUri, String chosenFileName, Progress
    protected void onPostExecute(Uri resultFilename)
    {
       super.onPostExecute(resultFilename);
-      ShareTrack.sendFile(mContext, resultFilename, mContext.getString(R.string.email_kmzbody), getContentType());
+      ShareTrack.sendFile(mContext, resultFilename, getContentType(), mContext.getString(R.string.email_kmzbody));
    }
    
 }