Fixed clicking message notification crashing the app
Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'ollieh-master'