unindented SO MANY THINGS. But no really. Redesigning receiving messages