We need to take the user timezone into account

Second part of 78bea41760c0b593697519896a3d99c6ce1fd369