Restructure the compose message section a bit