Bug 914636 - Fixing message handler