formatting; added 'app message' support