Fix messages view and form

3 jobs for routing_messages_fix in 1 minute and 20 seconds