I've done the same, but switched to: * Autistici/Inventati (http://www.autistici.org) for email and jabber * owncloud for files, calendar, news, contacts * cyanogenmod and f-droid instead of vanilla android and google play