Restore my sleep to its original state.

This feature correction will restore my (our?) sleep to its original state.
Will also improve message update trustability in all channels.

This PR is untested though.