Add google voice, fix messages