[#1695] Fallback when retrieving messages