revise format message issue : from 2 weekes to 1 week when it is 7 days before