update messaenger in both themes to be OK with a manual diff check