This fixes https://gitlab.e.foundation/e/apps/Message/issues/20
This will create a new commit in order to revert the existing changes.
