Added index hint in the messages query
Prevent crash on machines where email isn't set up