messages and avatar fix