my Non B visa expires on the 25th May 2013 and i plan to leave the country April 26th. do i need to get a re entry permit if my visa is going to expire? if i depart on Mrach 25th do i need to get a re enry permit to Thailand?

My Non B visa expires on the 25th May 2013 and my re entry permit is valid until 25 May 2013. I plan to leave the country on  April 26th to do my visa run. Do i need to get a re entry permit if my visa is going to expire? If i depart on May 25th do i need to get a re entry permit to Thailand?