substitution now expands long messages. fixes #159