Updated to contour 2.1.0.beta17
Updated mail_view to 2.0.1