This is for bug #2046 
It add aditional check for "tomorrow, today ..." dates.