diff --git a/gajim/.footprint b/gajim/.footprint
index 925ff4e23..526bfaff6 100644
--- a/gajim/.footprint
+++ b/gajim/.footprint
@@ -5,10 +5,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gajim-remote
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/gajim/
--rwxr-xr-x	root/root	usr/lib/gajim/gtkspell.la
--rwxr-xr-x	root/root	usr/lib/gajim/gtkspell.so
--rwxr-xr-x	root/root	usr/lib/gajim/idle.la
--rwxr-xr-x	root/root	usr/lib/gajim/idle.so
 -rwxr-xr-x	root/root	usr/lib/gajim/trayicon.la
 -rwxr-xr-x	root/root	usr/lib/gajim/trayicon.so
 drwxr-xr-x	root/root	usr/man/
@@ -264,9 +260,9 @@ drwxr-xr-x	root/root	usr/share/gajim/data/glade/
 -rw-r--r--	root/root	usr/share/gajim/data/glade/change_password_dialog.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/change_status_message_dialog.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/chat_context_menu.glade
--rw-r--r--	root/root	usr/share/gajim/data/glade/chat_control_popup_menu.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/chat_to_muc_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/choose_gpg_key_dialog.glade
+-rw-r--r--	root/root	usr/share/gajim/data/glade/contact_context_menu.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/data_form_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/dubbleinput_dialog.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/edit_groups_dialog.glade
@@ -286,6 +282,7 @@ drwxr-xr-x	root/root	usr/share/gajim/data/glade/
 -rw-r--r--	root/root	usr/share/gajim/data/glade/manage_bookmarks_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/manage_pep_services_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/manage_proxies_window.glade
+-rw-r--r--	root/root	usr/share/gajim/data/glade/manage_sounds_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/message_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/passphrase_dialog.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/popup_notification_window.glade
@@ -295,7 +292,7 @@ drwxr-xr-x	root/root	usr/share/gajim/data/glade/
 -rw-r--r--	root/root	usr/share/gajim/data/glade/profile_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/progress_dialog.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/remove_account_window.glade
--rw-r--r--	root/root	usr/share/gajim/data/glade/roster_contact_context_menu.glade
+-rw-r--r--	root/root	usr/share/gajim/data/glade/roster_item_exchange_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/roster_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/search_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/service_discovery_window.glade
@@ -308,34 +305,9 @@ drwxr-xr-x	root/root	usr/share/gajim/data/glade/
 -rw-r--r--	root/root	usr/share/gajim/data/glade/systray_context_menu.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/vcard_information_window.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/xml_console_window.glade
--rw-r--r--	root/root	usr/share/gajim/data/glade/zeroconf_contact_context_menu.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/zeroconf_context_menu.glade
 -rw-r--r--	root/root	usr/share/gajim/data/glade/zeroconf_information_window.glade
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/crystal/
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/crystal/16x16/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/away.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/chat.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/closed.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/connecting.gif
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/dnd.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/error.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/event.gif
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/invisible.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/muc_inactive.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/not_in_roster.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/online.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/opened.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/requested.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/16x16/xa.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/crystal/32x32/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/32x32/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/32x32/muc_inactive.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/crystal/48x48/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/48x48/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/crystal/48x48/online.png
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/dcraven/
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/dcraven/16x16/
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/dcraven/16x16/away.png
@@ -444,30 +416,6 @@ drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/goojim/32x32/
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/goojim/48x48/
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/goojim/48x48/offline.png
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/goojim/48x48/online.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/gossip/
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/gossip/16x16/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/away.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/chat.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/closed.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/connecting.gif
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/dnd.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/error.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/event.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/invisible.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/muc_inactive.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/not_in_roster.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/online.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/opened.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/requested.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/16x16/xa.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/gossip/32x32/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/32x32/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/32x32/muc_inactive.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/gossip/48x48/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/48x48/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/gossip/48x48/online.png
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/gota/
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/gota/16x16/
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/gota/16x16/away.png
@@ -540,78 +488,6 @@ drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/jabberbulb/32x32/
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/jabberbulb/48x48/
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/jabberbulb/48x48/offline.png
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/jabberbulb/48x48/online.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/nuvola/
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/away.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/chat.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/closed.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/connecting.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/dnd.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/error.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/event.gif
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/invisible.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/muc_inactive.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/not_in_roster.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/online.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/opened.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/requested.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/16x16/xa.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/nuvola/32x32/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/32x32/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/32x32/muc_inactive.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/nuvola/48x48/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/48x48/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/nuvola/48x48/online.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/simplebulb/
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/away.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/chat.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/closed.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/connecting.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/dnd.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/error.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/event.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/invisible.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/muc_inactive.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/not_in_roster.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/online.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/opened.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/requested.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/16x16/xa.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/simplebulb/32x32/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/32x32/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/32x32/muc_inactive.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/simplebulb/48x48/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/48x48/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/simplebulb/48x48/online.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/stellar/
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/stellar/16x16/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/away.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/chat.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/closed.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/connecting.gif
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/dnd.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/error.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/event.gif
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/invisible.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/muc_inactive.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/not_in_roster.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/online.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/opened.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/requested.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/16x16/xa.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/stellar/32x32/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/32x32/muc_active.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/32x32/muc_inactive.png
-drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/stellar/48x48/
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/48x48/offline.png
--rw-r--r--	root/root	usr/share/gajim/data/iconsets/stellar/48x48/online.png
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/sun/
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/sun/16x16/
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/sun/16x16/away.png
@@ -856,6 +732,50 @@ drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/transports/yahoo/32x32/
 drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/transports/yahoo/48x48/
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/transports/yahoo/48x48/offline.png
 -rw-r--r--	root/root	usr/share/gajim/data/iconsets/transports/yahoo/48x48/online.png
+drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/wroop/
+drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/wroop/16x16/
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/away.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/chat.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/closed.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/connecting.gif
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/dnd.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/error.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/event.gif
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/invisible.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/muc_active.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/muc_inactive.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/not_in_roster.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/offline.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/online.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/opened.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/requested.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/16x16/xa.png
+drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/wroop/32x32/
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/away.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/chat.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/dnd.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/error.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/invisible.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/muc_active.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/muc_inactive.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/not_in_roster.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/offline.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/online.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/requested.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/32x32/xa.png
+drwxr-xr-x	root/root	usr/share/gajim/data/iconsets/wroop/48x48/
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/away.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/chat.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/dnd.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/error.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/invisible.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/muc_active.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/muc_inactive.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/not_in_roster.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/offline.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/online.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/requested.png
+-rw-r--r--	root/root	usr/share/gajim/data/iconsets/wroop/48x48/xa.png
 drwxr-xr-x	root/root	usr/share/gajim/data/moods/
 drwxr-xr-x	root/root	usr/share/gajim/data/moods/default/
 -rw-r--r--	root/root	usr/share/gajim/data/moods/default/afraid.png
@@ -996,6 +916,7 @@ drwxr-xr-x	root/root	usr/share/gajim/data/pixmaps/events/
 -rw-r--r--	root/root	usr/share/gajim/data/pixmaps/security-low-big.png
 -rw-r--r--	root/root	usr/share/gajim/data/pixmaps/security-low.png
 -rw-r--r--	root/root	usr/share/gajim/data/pixmaps/upload.png
+-rw-r--r--	root/root	usr/share/gajim/data/pixmaps/warning.png
 drwxr-xr-x	root/root	usr/share/gajim/data/sounds/
 -rw-r--r--	root/root	usr/share/gajim/data/sounds/bounce.wav
 -rw-r--r--	root/root	usr/share/gajim/data/sounds/connected.wav
@@ -1009,9 +930,9 @@ drwxr-xr-x	root/root	usr/share/gajim/src/
 -rw-r--r--	root/root	usr/share/gajim/src/adhoc_commands.py
 -rw-r--r--	root/root	usr/share/gajim/src/adhoc_commands.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/adhoc_commands.pyo
--rw-r--r--	root/root	usr/share/gajim/src/advanced.py
--rw-r--r--	root/root	usr/share/gajim/src/advanced.pyc
--rw-r--r--	root/root	usr/share/gajim/src/advanced.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/advanced_configuration_window.py
+-rw-r--r--	root/root	usr/share/gajim/src/advanced_configuration_window.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/advanced_configuration_window.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/atom_window.py
 -rw-r--r--	root/root	usr/share/gajim/src/atom_window.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/atom_window.pyo
@@ -1021,6 +942,38 @@ drwxr-xr-x	root/root	usr/share/gajim/src/
 -rw-r--r--	root/root	usr/share/gajim/src/chat_control.py
 -rw-r--r--	root/root	usr/share/gajim/src/chat_control.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/chat_control.pyo
+drwxr-xr-x	root/root	usr/share/gajim/src/command_system/
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/__init__.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/__init__.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/__init__.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/dispatching.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/dispatching.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/dispatching.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/errors.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/errors.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/errors.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/framework.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/framework.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/framework.pyo
+drwxr-xr-x	root/root	usr/share/gajim/src/command_system/implementation/
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/__init__.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/__init__.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/__init__.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/custom.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/custom.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/custom.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/hosts.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/hosts.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/hosts.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/middleware.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/middleware.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/middleware.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/standard.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/standard.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/implementation/standard.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/mapping.py
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/mapping.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/command_system/mapping.pyo
 drwxr-xr-x	root/root	usr/share/gajim/src/common/
 -rw-r--r--	root/root	usr/share/gajim/src/common/GnuPG.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/GnuPG.pyc
@@ -1091,15 +1044,21 @@ drwxr-xr-x	root/root	usr/share/gajim/src/common/
 -rw-r--r--	root/root	usr/share/gajim/src/common/i18n.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/i18n.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/i18n.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/idle.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/idle.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/idle.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/kwalletbinding.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/kwalletbinding.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/kwalletbinding.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/latex.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/latex.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/latex.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/logger.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/logger.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/logger.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/nslookup.py
--rw-r--r--	root/root	usr/share/gajim/src/common/nslookup.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/nslookup.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/logging_helpers.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/logging_helpers.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/logging_helpers.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/optparser.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/optparser.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/optparser.pyo
@@ -1115,6 +1074,9 @@ drwxr-xr-x	root/root	usr/share/gajim/src/common/
 -rw-r--r--	root/root	usr/share/gajim/src/common/pubsub.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/pubsub.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/pubsub.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/resolver.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/resolver.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/resolver.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/rst_xhtml_generator.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/rst_xhtml_generator.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/rst_xhtml_generator.pyo
@@ -1131,72 +1093,51 @@ drwxr-xr-x	root/root	usr/share/gajim/src/common/xmpp/
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/__init__.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/__init__.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/__init__.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/auth.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/auth.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/auth.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/auth_nb.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/auth_nb.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/auth_nb.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/browser.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/browser.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/browser.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/bosh.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/bosh.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/bosh.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/c14n.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/c14n.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/c14n.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/client.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/client.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/client.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/client_nb.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/client_nb.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/client_nb.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/commands.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/commands.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/commands.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/debug.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/debug.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/debug.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/dispatcher.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/dispatcher.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/dispatcher.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/dispatcher_nb.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/dispatcher_nb.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/dispatcher_nb.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/features.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/features.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/features.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/features_nb.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/features_nb.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/features_nb.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/filetransfer.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/filetransfer.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/filetransfer.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/idlequeue.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/idlequeue.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/idlequeue.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/plugin.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/plugin.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/plugin.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/protocol.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/protocol.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/protocol.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/roster.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/roster.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/roster.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/proxy_connectors.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/proxy_connectors.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/proxy_connectors.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/roster_nb.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/roster_nb.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/roster_nb.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/session.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/session.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/session.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/simplexml.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/simplexml.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/simplexml.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/transports.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/transports.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/transports.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/stringprepare.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/stringprepare.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/stringprepare.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/tls_nb.py
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/tls_nb.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/tls_nb.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/transports_nb.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/transports_nb.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/common/xmpp/transports_nb.pyo
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp_stringprep.py
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp_stringprep.pyc
--rw-r--r--	root/root	usr/share/gajim/src/common/xmpp_stringprep.pyo
 drwxr-xr-x	root/root	usr/share/gajim/src/common/zeroconf/
 -rw-r--r--	root/root	usr/share/gajim/src/common/zeroconf/__init__.py
 -rw-r--r--	root/root	usr/share/gajim/src/common/zeroconf/__init__.pyc
@@ -1264,6 +1205,12 @@ drwxr-xr-x	root/root	usr/share/gajim/src/common/zeroconf/
 -rw-r--r--	root/root	usr/share/gajim/src/gtkgui_helpers.py
 -rw-r--r--	root/root	usr/share/gajim/src/gtkgui_helpers.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/gtkgui_helpers.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/gtkspell.py
+-rw-r--r--	root/root	usr/share/gajim/src/gtkspell.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/gtkspell.pyo
+-rw-r--r--	root/root	usr/share/gajim/src/gui_menu_builder.py
+-rw-r--r--	root/root	usr/share/gajim/src/gui_menu_builder.pyc
+-rw-r--r--	root/root	usr/share/gajim/src/gui_menu_builder.pyo
 -rw-r--r--	root/root	usr/share/gajim/src/history_manager.py
 -rw-r--r--	root/root	usr/share/gajim/src/history_manager.pyc
 -rw-r--r--	root/root	usr/share/gajim/src/history_manager.pyo
diff --git a/gajim/.md5sum b/gajim/.md5sum
index fc541374e..cc60ea4c7 100644
--- a/gajim/.md5sum
+++ b/gajim/.md5sum
@@ -1 +1 @@
-aef65fc0b0f993f322ee970f6deb7508  gajim-0.12.5.tar.bz2
+91606788f4d846b2d9c48abf8ec0781c  gajim-0.13.2.tar.bz2
diff --git a/gajim/Pkgfile b/gajim/Pkgfile
index 2d9c5c7de..b0bd28607 100644
--- a/gajim/Pkgfile
+++ b/gajim/Pkgfile
@@ -7,9 +7,9 @@
 # you'll want nslookup (from bind) OR libasyncns-python
 
 name=gajim
-version=0.12.5
+version=0.13.2
 release=1
-source=(http://www.gajim.org/downloads/$name-$version.tar.bz2)
+source=(http://www.gajim.org/downloads/0.13/$name-$version.tar.bz2)
 		
 build() {
 	cd $name-$version