--- thunar/thunar-window.c	2008-08-03 17:49:04.000000000 +0200
+++ thunar/thunar-window.c	2008-08-03 17:47:54.000000000 +0200
@@ -1794,7 +1794,6 @@
 thunar_window_action_open_templates (GtkAction    *action,
                                      ThunarWindow *window)
 {
-  ThunarVfsPath *home_path;
   ThunarVfsPath *templates_path;
   ThunarFile    *templates_file = NULL;
   GtkWidget     *dialog;
@@ -1805,15 +1804,16 @@
   GtkWidget     *vbox;
   gboolean       show_about_templates;
   GError        *error = NULL;
+  gchar         *templates_dir;
   gchar         *absolute_path;
 
   _thunar_return_if_fail (GTK_IS_ACTION (action));
   _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
 
   /* determine the path to the ~/Templates folder */
-  home_path = thunar_vfs_path_get_for_home ();
-  templates_path = thunar_vfs_path_relative (home_path, "Templates");
-  thunar_vfs_path_unref (home_path);
+  templates_dir = g_build_filename(g_get_user_data_dir(), "templates", NULL);
+  templates_path = thunar_vfs_path_new(templates_dir, NULL);
+  g_free(templates_dir);
 
   /* make sure that the ~/Templates folder exists */
   absolute_path = thunar_vfs_path_dup_string (templates_path);
--- thunar/thunar-templates-action.c	2008-08-03 17:48:50.000000000 +0200
+++ thunar/thunar-templates-action.c	2008-08-03 17:48:19.000000000 +0200
@@ -348,10 +348,10 @@
                                     ThunarTemplatesAction *templates_action)
 {
   ThunarVfsPath *templates_path;
-  ThunarVfsPath *home_path;
   GtkWidget     *image;
   GtkWidget     *item;
   GList         *children;
+  gchar         *templates_dir;
 
   _thunar_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
   _thunar_return_if_fail (GTK_IS_MENU_SHELL (menu));
@@ -362,9 +362,9 @@
   g_list_free (children);
 
   /* determine the path to the ~/Templates folder */
-  home_path = thunar_vfs_path_get_for_home ();
-  templates_path = thunar_vfs_path_relative (home_path, "Templates");
-  thunar_vfs_path_unref (home_path);
+  templates_dir = g_build_filename(g_get_user_data_dir(), "templates", NULL);
+  templates_path = thunar_vfs_path_new(templates_dir, NULL);
+  g_free(templates_dir);
 
   /* fill the menu with files/folders from the ~/Templates folder */
   thunar_templates_action_fill_menu (templates_action, templates_path, menu);