Revert "MessageContent moved into separated method"

This reverts commit 1c8f8ddcd75750cfffb61b1f708ecb5aa659be4c.