diff --git a/studio/app/src/main/AndroidManifest.xml b/studio/app/src/main/AndroidManifest.xml
index 3bb40d1a..952ad651 100644
--- a/studio/app/src/main/AndroidManifest.xml
+++ b/studio/app/src/main/AndroidManifest.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="nl.sogeti.android.gpstracker"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:installLocation="auto"
-          android:versionCode="85"
-          android:versionName="1.3.5">
+<manifest
+    package="nl.sogeti.android.gpstracker"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto"
+    android:versionCode="85"
+    android:versionName="1.3.5">
 
     <uses-sdk
         android:minSdkVersion="4"
@@ -135,7 +136,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
diff --git a/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java b/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java
index 1b0dd11e..d8feb545 100644
--- a/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java
+++ b/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxCreator.java
@@ -549,6 +549,6 @@ private void serializeTrackPoints(XmlSerializer serializer, Uri waypoints) throw
    @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/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java b/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java
index 2c28737a..a16a92c9 100644
--- a/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java
+++ b/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/GpxSharing.java
@@ -55,7 +55,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/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java b/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java
index 0f0b1d20..ca984a76 100644
--- a/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java
+++ b/studio/app/src/main/java/nl/sogeti/android/gpstracker/actions/tasks/KmzSharing.java
@@ -53,7 +53,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));
    }
 
 }