diff --git a/ChangeLog b/ChangeLog
index d034831c0..d4fba95d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-28  Don Allingham  <don@gramps-project.org>
+	* src/Mime/_GnomeMime.py: find the default application instead of 
+	using the first returned by mime_get_app_short_list
+
 2006-03-27  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/DataViews/_PedigreeView.py (_PersonWidget_base): Use other name for
 	the drag_begin callback to not conflict with a gtk.Widget internal method.
diff --git a/src/Mime/_GnomeMime.py b/src/Mime/_GnomeMime.py
index e9ae6056f..2127565e3 100644
--- a/src/Mime/_GnomeMime.py
+++ b/src/Mime/_GnomeMime.py
@@ -25,10 +25,10 @@ import const
 
 try:
     from gnomevfs import mime_get_short_list_applications, \
-         mime_get_description, get_mime_type
+         mime_get_description, get_mime_type, mime_get_default_application
 except:
     from gnome.vfs import mime_get_short_list_applications, \
-         mime_get_description, get_mime_type
+         mime_get_description, get_mime_type, mime_get_default_application
     
 from TransUtils import sgettext as _
 
@@ -38,7 +38,7 @@ def get_application(type):
     try:
         applist = mime_get_short_list_applications(type)
         if applist:
-            prog = applist[0]
+            prog = mime_get_default_application(type)
             return (prog[2],prog[1])
         else:
             return None