replaced my mail with my G+ account. Not pretty but at least no spam.