Fix some email pages using request context