We don't need to force the original message when looking up. Resolved #38.