diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index b16a3e7..fba48f8 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -838,10 +838,18 @@ empathy_adium_info_new (const gchar *path)
 	value = empathy_plist_parse_from_file (file);
 	g_free (file);
 
-	if (value) {
-		info = g_value_dup_boxed (value);
-		tp_g_value_slice_free (value);
-	}
+	if (value == NULL)
+		return NULL;
+
+	info = g_value_dup_boxed (value);
+	tp_g_value_slice_free (value);
+
+	/* Insert the theme's path into the hash table */
+	value = tp_g_value_slice_new (G_TYPE_STRING);
+	g_value_set_string (value, path);
+	g_hash_table_insert (info,
+		g_strdup ("path"),
+		value);
 
 	return info;
 }
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index ba3d48e..96f6a49 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
+#include <telepathy-glib/dbus.h>
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
@@ -67,9 +68,6 @@ static const gchar *themes[] = {
 	"simple", N_("Simple"),
 	"clean", N_("Clean"),
 	"blue", N_("Blue"),
-#ifdef HAVE_WEBKIT
-	"adium", N_("Adium"),
-#endif
 	NULL
 };
 
@@ -378,6 +376,10 @@ theme_manager_ensure_theme_exists (const gchar *name)
 		return FALSE;
 	}
 
+	if (strcmp ("adium", name) == 0) {
+		return TRUE;
+	}
+
 	for (i = 0; themes[i]; i += 2) {
 		if (strcmp (themes[i], name) == 0) {
 			return TRUE;
@@ -534,3 +536,49 @@ empathy_theme_manager_get_themes (void)
 	return themes;
 }
 
+static void
+find_themes (GList **list, const gchar *dirpath)
+{
+	GDir *dir;
+	GError *error = NULL;
+	const gchar *name = NULL;
+	GHashTable *info = NULL;
+
+	dir = g_dir_open (dirpath, 0, &error);
+	if (dir != NULL) {
+		do {
+			name = g_dir_read_name (dir);
+			gchar *filename = g_build_filename (dirpath, name,
+				"Contents", "Info.plist", NULL);
+			if (g_file_test (filename, G_FILE_TEST_EXISTS) &&
+			    g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
+				gchar *path;
+				path = g_build_path (G_DIR_SEPARATOR_S, dirpath, name, NULL);
+				info = empathy_adium_info_new (path);
+				if (info != NULL) {
+					*list = g_list_append (*list, info);
+				}
+				g_free (path);
+			}
+			g_free (filename);
+
+		} while (name != NULL);
+		g_dir_close(dir);
+	} else {
+		g_warning("Error opening %s: %s\n", dirpath, error->message);
+	}
+}
+
+GList *
+empathy_theme_manager_get_adium_themes (void)
+{
+	GList *themes = NULL;
+	gchar *userpath = NULL;
+
+	userpath = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "adium", NULL);
+	find_themes (&themes, userpath);
+	g_free (userpath);
+
+	find_themes (&themes, "/usr/share/adium/");
+	return themes;
+}
diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h
index 99c96d7..a459b43 100644
--- a/libempathy-gtk/empathy-theme-manager.h
+++ b/libempathy-gtk/empathy-theme-manager.h
@@ -51,6 +51,7 @@ struct _EmpathyThemeManagerClass {
 GType                   empathy_theme_manager_get_type    (void) G_GNUC_CONST;
 EmpathyThemeManager *   empathy_theme_manager_get         (void);
 const gchar **          empathy_theme_manager_get_themes  (void);
+GList *                 empathy_theme_manager_get_adium_themes (void);
 EmpathyChatView *       empathy_theme_manager_create_view (EmpathyThemeManager *manager);
 
 G_END_DECLS
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 0e2299c..a75a3d0 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -28,6 +28,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <telepathy-glib/dbus.h>
 
 #include <libempathy/empathy-utils.h>
 
@@ -54,9 +55,6 @@ typedef struct {
 	GtkWidget *checkbutton_show_smileys;
 	GtkWidget *checkbutton_show_contacts_in_rooms;
 	GtkWidget *combobox_chat_theme;
-	GtkWidget *hbox_adium_theme;
-	GtkWidget *filechooserbutton_adium_theme;
-	GtkWidget *label_invalid_adium_theme;
 	GtkWidget *checkbutton_separate_chat_windows;
 	GtkWidget *checkbutton_autoconnect;
 	GtkWidget *radiobutton_contact_list_sort_by_name;
@@ -139,8 +137,10 @@ enum {
 };
 
 enum {
+	COL_COMBO_IS_ADIUM,
 	COL_COMBO_VISIBLE_NAME,
 	COL_COMBO_NAME,
+	COL_COMBO_PATH,
 	COL_COMBO_COUNT
 };
 
@@ -953,73 +953,6 @@ preferences_radio_button_toggled_cb (GtkWidget *button,
 	empathy_conf_set_string (empathy_conf_get (), key, value);
 }
 
-
-static void
-preferences_theme_adium_update_visibility (EmpathyPreferences *preferences,
-					   const gchar        *name)
-{
-	if (name && strcmp (name, "adium") == 0) {
-		gtk_widget_show (preferences->hbox_adium_theme);
-	} else {
-		gtk_widget_hide (preferences->hbox_adium_theme);
-		gtk_widget_hide (preferences->label_invalid_adium_theme);
-	}
-}
-
-static void
-preferences_theme_adium_update_validity (EmpathyPreferences *preferences,
-					 const gchar        *path)
-{
-#ifdef HAVE_WEBKIT
-	if (empathy_adium_path_is_valid (path)) {
-		gtk_widget_hide (preferences->label_invalid_adium_theme);
-	} else {
-		gtk_widget_show (preferences->label_invalid_adium_theme);
-	}
-#endif
-}
-
-static void
-preferences_theme_adium_path_notify_cb (EmpathyConf *conf,
-					const gchar *key,
-					gpointer     user_data)
-{
-	EmpathyPreferences *preferences = user_data;
-	GtkFileChooser     *chooser;
-	gchar              *value;
-	const gchar        *path;
-
-	if (!empathy_conf_get_string (conf, key, &value)) {
-		return;
-	}
-
-	if (EMP_STR_EMPTY (value)) {
-		path = g_get_home_dir ();
-	} else {
-		path = value;
-	}
-
-	chooser = GTK_FILE_CHOOSER (preferences->filechooserbutton_adium_theme);
-	gtk_file_chooser_set_current_folder (chooser, path);
-	preferences_theme_adium_update_validity (preferences, path);
-	g_free (value);
-}
-
-static void
-preferences_theme_adium_file_set_cb (GtkFileChooser     *chooser,
-				     EmpathyPreferences *preferences)
-{
-	gchar *path;
-
-	path = gtk_file_chooser_get_current_folder (chooser);
-	empathy_conf_set_string (empathy_conf_get (),
-				 EMPATHY_PREFS_CHAT_ADIUM_PATH,
-				 path);
-	preferences_theme_adium_update_validity (preferences, path);
-
-	g_free (path);
-}
-
 static void
 preferences_theme_notify_cb (EmpathyConf *conf,
 			     const gchar *key,
@@ -1027,31 +960,44 @@ preferences_theme_notify_cb (EmpathyConf *conf,
 {
 	EmpathyPreferences *preferences = user_data;
 	GtkComboBox        *combo;
-	gchar              *value;
+	gchar              *conf_name;
+	gchar              *conf_path;
 	GtkTreeModel       *model;
 	GtkTreeIter         iter;
 	gboolean            found = FALSE;
 
-	if (!empathy_conf_get_string (conf, key, &value)) {
+	if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_THEME, &conf_name)) {
 		return;
 	}
 
-	preferences_theme_adium_update_visibility (preferences, value);
+	if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_ADIUM_PATH, &conf_path)) {
+		return;
+	}
 
 	combo = GTK_COMBO_BOX (preferences->combobox_chat_theme);
 	model = gtk_combo_box_get_model (combo);
-	if (value && gtk_tree_model_get_iter_first (model, &iter)) {
+	if (gtk_tree_model_get_iter_first (model, &iter)) {
+		gboolean is_adium;
 		gchar *name;
+		gchar *path;
 
 		do {
 			gtk_tree_model_get (model, &iter,
+					    COL_COMBO_IS_ADIUM, &is_adium,
 					    COL_COMBO_NAME, &name,
+					    COL_COMBO_PATH, &path,
 					    -1);
 
-			if (strcmp (name, value) == 0) {
-				found = TRUE;
-				gtk_combo_box_set_active_iter (combo, &iter);
-				break;
+			if (strcmp (name, conf_name) == 0) {
+				if (strcmp (name, "adium") != 0) {
+					found = TRUE;
+					gtk_combo_box_set_active_iter (combo, &iter);
+					break;
+				} else if (strcmp (path, conf_path) == 0) {
+					found = TRUE;
+					gtk_combo_box_set_active_iter (combo, &iter);
+					break;
+				}
 			}
 
 			g_free (name);
@@ -1065,7 +1011,8 @@ preferences_theme_notify_cb (EmpathyConf *conf,
 		}
 	}
 
-	g_free (value);
+	g_free (conf_name);
+	g_free (conf_path);
 }
 
 static void
@@ -1074,24 +1021,43 @@ preferences_theme_changed_cb (GtkComboBox        *combo,
 {
 	GtkTreeModel *model;
 	GtkTreeIter   iter;
+	gboolean      is_adium;
 	gchar        *name;
+	gchar        *path;
 
 	if (gtk_combo_box_get_active_iter (combo, &iter)) {
 		model = gtk_combo_box_get_model (combo);
 
 		gtk_tree_model_get (model, &iter,
+				    COL_COMBO_IS_ADIUM, &is_adium,
 				    COL_COMBO_NAME, &name,
+				    COL_COMBO_PATH, &path,
 				    -1);
 
-		preferences_theme_adium_update_visibility (preferences, name);
-
 		empathy_conf_set_string (empathy_conf_get (),
 					 EMPATHY_PREFS_CHAT_THEME,
 					 name);
+		if (is_adium == TRUE)
+			empathy_conf_set_string (empathy_conf_get (),
+						 EMPATHY_PREFS_CHAT_ADIUM_PATH,
+						 path);
 		g_free (name);
+		g_free (path);
 	}
 }
 
+static const gchar *
+get_string (GHashTable *table, const gchar *key)
+{
+	GValue *value = NULL;
+
+	value = g_hash_table_lookup (table, key);
+	if (value == NULL)
+		return NULL;
+
+	return g_value_get_string (value);
+}
+
 static void
 preferences_themes_setup (EmpathyPreferences *preferences)
 {
@@ -1100,6 +1066,7 @@ preferences_themes_setup (EmpathyPreferences *preferences)
 	GtkCellRenderer *renderer;
 	GtkListStore  *store;
 	const gchar  **themes;
+	GList         *adium_themes;
 	gint           i;
 	guint          id;
 
@@ -1108,18 +1075,47 @@ preferences_themes_setup (EmpathyPreferences *preferences)
 
 	/* Create the model */
 	store = gtk_list_store_new (COL_COMBO_COUNT,
+				    G_TYPE_BOOLEAN, /* Is an Adium theme */
 				    G_TYPE_STRING,  /* Display name */
-				    G_TYPE_STRING); /* Theme name */
+				    G_TYPE_STRING,  /* Theme name */
+				    G_TYPE_STRING); /* Theme path */
+	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+		COL_COMBO_VISIBLE_NAME, GTK_SORT_ASCENDING);
 
 	/* Fill the model */
 	themes = empathy_theme_manager_get_themes ();
 	for (i = 0; themes[i]; i += 2) {
 		gtk_list_store_insert_with_values (store, NULL, -1,
+			COL_COMBO_IS_ADIUM, FALSE,
 			COL_COMBO_VISIBLE_NAME, _(themes[i + 1]),
 			COL_COMBO_NAME, themes[i],
+			COL_COMBO_PATH, NULL,
 			-1);
 	}
 
+	adium_themes = empathy_theme_manager_get_adium_themes ();
+	while (adium_themes != NULL) {
+		GHashTable *info;
+		const gchar *name;
+		const gchar *path;
+
+		info = adium_themes->data;
+		name = get_string (info, "CFBundleName");
+		path = get_string (info, "path");
+
+		if (name != NULL && path != NULL) {
+			gtk_list_store_insert_with_values (store, NULL, -1,
+				COL_COMBO_IS_ADIUM, TRUE,
+				COL_COMBO_VISIBLE_NAME, name,
+				COL_COMBO_NAME, "adium",
+				COL_COMBO_PATH, path,
+				-1);
+		}
+		g_hash_table_unref (info);
+		adium_themes = g_list_next (adium_themes);
+	}
+	g_list_free (adium_themes);
+
 	/* Add cell renderer */
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
@@ -1145,17 +1141,9 @@ preferences_themes_setup (EmpathyPreferences *preferences)
 		preferences_add_id (preferences, id);
 	}
 
-	g_signal_connect (preferences->filechooserbutton_adium_theme,
-			  "file-set",
-			  G_CALLBACK (preferences_theme_adium_file_set_cb),
-			  preferences);
-	/* Select the adium path from the gconf key and track changes */
-	preferences_theme_adium_path_notify_cb (empathy_conf_get (),
-						EMPATHY_PREFS_CHAT_ADIUM_PATH,
-						preferences);
 	id = empathy_conf_notify_add (empathy_conf_get (),
 				      EMPATHY_PREFS_CHAT_ADIUM_PATH,
-				      preferences_theme_adium_path_notify_cb,
+				      preferences_theme_notify_cb,
 				      preferences);
 	if (id) {
 		preferences_add_id (preferences, id);
@@ -1211,9 +1199,6 @@ empathy_preferences_show (GtkWindow *parent)
 		"checkbutton_show_smileys", &preferences->checkbutton_show_smileys,
 		"checkbutton_show_contacts_in_rooms", &preferences->checkbutton_show_contacts_in_rooms,
 		"combobox_chat_theme", &preferences->combobox_chat_theme,
-		"hbox_adium_theme", &preferences->hbox_adium_theme,
-		"filechooserbutton_adium_theme", &preferences->filechooserbutton_adium_theme,
-		"label_invalid_adium_theme", &preferences->label_invalid_adium_theme,
 		"checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows,
 		"checkbutton_autoconnect", &preferences->checkbutton_autoconnect,
 		"radiobutton_contact_list_sort_by_name", &preferences->radiobutton_contact_list_sort_by_name,
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 38cfd34..05f5153 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -527,10 +527,10 @@
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="wrap">True</property>
                                     <property name="label" translatable="yes">Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;).</property>
+                                    <property name="wrap">True</property>
                                     <attributes>
-                                      <attribute name="scale" value="0.8"/>
+                                      <attribute name="scale" value="0.800000"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -748,10 +748,10 @@
                                   <object class="GtkLabel" id="label616">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                    <property name="wrap">True</property>
                                     <property name="label" translatable="yes">The list of languages reflects only the languages for which you have a dictionary installed.</property>
+                                    <property name="wrap">True</property>
                                     <attributes>
-                                      <attribute name="scale" value="0.8"/>
+                                      <attribute name="scale" value="0.800000"/>
                                     </attributes>
                                   </object>
                                   <packing>
@@ -851,50 +851,6 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox_adium_theme">
-                                <property name="visible">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label587">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Adium theme to use:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkFileChooserButton" id="filechooserbutton_adium_theme">
-                                    <property name="visible">True</property>
-                                    <property name="preview_widget_active">False</property>
-                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label_invalid_adium_theme">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Not a valid adium theme</property>
-                                <attributes>
-                                  <attribute name="foreground" value="red"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                         </child>
                       </object>
