fall back to the full message for the key closes #2096