FREEI-215 Sending Messages should show who from and who to, also cleanup