Moved messenger from bricks, again
Indentation