Should be 2008. When you were doing your H1B transfer, the USCIS has already extended your "valid stay period" to 2008.