Improve sample for the wall messages