Added plumbing for abort message in message queue. Fixed tabbing.