Bug fix, no messages button