Fix replying and forwarding of messages