Restrict special datetime handling to parts of messages

This is an alternate implementation of #826.
Circular import issues?