There has been reports of an extension to the amnesty for another 2 months, but realistically, I think it would be for 1 month, only if the boarders do not open in August. This will also allow tourists to re-book their return flights for August, as July still has limited flights departing Bangkok (and these flights are liable for cancellation). I personally, would go to the Immigration Office 3 days prior to the amnesty ending, to apply for a TBP (Temporary Boarder Pass), which allows you 7 days to book a flight out of Thailand, therefore preventing overstay fines or paying 1900 baht for another visa for 30 days. Only use this option, if there is no amnesty extension announced. Anyone with Thai Airway tickets - you can re-book your return flights from the 1st of August, as Thai Airways announced that they will start operating in August.