Bug 1033334

I think it should be at the end of sendMessage instead