Fixing up messageApp