Improve sample email context