XMPP fixes and ringtone selection fun!