Fixes voor de bugz
Merge branch 'pigeon' of https://github.com/appeljus/Messenger.git into pigeon