pre-message bugfixing branch

[Simon-Laux]

• handle forwarding and add a test for it.
• handle saving and add a test for it.
  • (needs to be merged in from draft: start with saving pre-message to self messages and test. #7561)

[link2xt]

It can be just merged into #7431 already and then reviewed in #7431