The changes from !878 (merged) without new message bubbles.
One more part of #1251 (closed)
This will create a new commit in order to revert the existing changes.
