diff --git a/ChangeLog b/ChangeLog
index fdcba328d0be99e63bdaddc835685b7b943fe4a3..7420d3809caa4cc21f549aee3c54ea1ce5a8c392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-05	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-computer-folder.c, thunar/thunar-file.c,
+	  thunar/thunar-list-model.c: Always return a valid ThunarVfsMimeInfo
+	  from the get_mime_info() method.
+
 2005-09-05	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-list-model.{c,h}: Drop the unused icon columns from the
diff --git a/thunar/thunar-computer-folder.c b/thunar/thunar-computer-folder.c
index 34f4a9833d193e19f62ce73f46b0e1f6e3d54974..90255b1e323a4319a0c95c99aac650b5e316f63e 100644
--- a/thunar/thunar-computer-folder.c
+++ b/thunar/thunar-computer-folder.c
@@ -50,6 +50,7 @@ static gboolean           thunar_computer_folder_has_parent             (ThunarF
 static ThunarFolder      *thunar_computer_folder_open_as_folder         (ThunarFile                *file,
                                                                          GError                   **error);
 static ThunarVfsURI      *thunar_computer_folder_get_uri                (ThunarFile                *file);
+static ThunarVfsMimeInfo *thunar_computer_folder_get_mime_info          (ThunarFile                *file);
 static const gchar       *thunar_computer_folder_get_display_name       (ThunarFile                *file);
 static ThunarVfsFileType  thunar_computer_folder_get_kind               (ThunarFile                *file);
 static ThunarVfsFileMode  thunar_computer_folder_get_mode               (ThunarFile                *file);
@@ -99,6 +100,7 @@ thunar_computer_folder_class_init (ThunarComputerFolderClass *klass)
   thunarfile_class->has_parent = thunar_computer_folder_has_parent;
   thunarfile_class->open_as_folder = thunar_computer_folder_open_as_folder;
   thunarfile_class->get_uri = thunar_computer_folder_get_uri;
+  thunarfile_class->get_mime_info = thunar_computer_folder_get_mime_info;
   thunarfile_class->get_display_name = thunar_computer_folder_get_display_name;
   thunarfile_class->get_kind = thunar_computer_folder_get_kind;
   thunarfile_class->get_mode = thunar_computer_folder_get_mode;
@@ -194,6 +196,21 @@ thunar_computer_folder_get_uri (ThunarFile *file)
 
 
 
+static ThunarVfsMimeInfo*
+thunar_computer_folder_get_mime_info (ThunarFile *file)
+{
+  ThunarVfsMimeDatabase *database;
+  ThunarVfsMimeInfo     *info;
+
+  database = thunar_vfs_mime_database_get_default ();
+  info = thunar_vfs_mime_database_get_info (database, "inode/directory");
+  exo_object_unref (EXO_OBJECT (database));
+
+  return info;
+}
+
+
+
 static const gchar*
 thunar_computer_folder_get_display_name (ThunarFile *file)
 {
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index bcca88576f3cdda6d75bd84abb2a7339c43ffa37..b7f7410b9afe1a1d3f413710c63abd94aeece8f4 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -823,11 +823,10 @@ thunar_file_get_uri (ThunarFile *file)
  * @file : a #ThunarFile instance.
  *
  * Returns the MIME type information for the given @file object. This
- * function may return %NULL if it is unable to determine a MIME type.
- * Therefore your component must be able to handle this case!
+ * function is garantied to always return a valid #ThunarVfsMimeInfo.
  *
  * This method automatically takes a reference on the returned
- * object for the caller, so you'll need to call #thunar_vfs_mime_info()
+ * object for the caller, so you'll need to call thunar_vfs_mime_info()
  * when you are done with it.
  *
  * Return value: the MIME type or %NULL.
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index 77a97fab6e2691391e9b44b778acbed4b9d2dde5..411c9ddfd88013fabd3463c26f2e9012b3b41aef 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -1893,27 +1893,17 @@ thunar_list_model_get_statusbar_text (ThunarListModel *store,
       /* calculate the text to be displayed */
       mime_info = thunar_file_get_mime_info (file);
       size_string = thunar_file_get_size_string (file);
-      if (G_LIKELY (mime_info != NULL))
+      if (G_LIKELY (size_string != NULL))
         {
-          if (G_LIKELY (size_string != NULL))
-            {
-              text = g_strdup_printf (_("\"%s\" (%s) %s"), thunar_file_get_display_name (file), size_string,
-                                      thunar_vfs_mime_info_get_comment (mime_info));
-            }
-          else
-            {
-              text = g_strdup_printf (_("\"%s\" %s"), thunar_file_get_display_name (file),
-                                      thunar_vfs_mime_info_get_comment (mime_info));
-            }
-          thunar_vfs_mime_info_unref (mime_info);
+          text = g_strdup_printf (_("\"%s\" (%s) %s"), thunar_file_get_display_name (file), size_string,
+                                  thunar_vfs_mime_info_get_comment (mime_info));
         }
       else
         {
-          if (G_LIKELY (size_string != NULL))
-            text = g_strdup_printf (_("\"%s\" (%s)"), thunar_file_get_display_name (file), size_string);
-          else
-            text = g_strdup_printf (_("\"%s\""), thunar_file_get_display_name (file));
+          text = g_strdup_printf (_("\"%s\" %s"), thunar_file_get_display_name (file),
+                                  thunar_vfs_mime_info_get_comment (mime_info));
         }
+      thunar_vfs_mime_info_unref (mime_info);
       g_free (size_string);
     }
   else