Better URI replace for messages. Close #16