Relative Message Dates misleading

Change dates of messages as they are the 'wrong' date. If today is Monday, messages sent the day before say "Yesterday" (correct) but messages from the day before say "Last Saturday". I feel this should say "Saturday" and messages from OVER days old should say "Last XXXDAY" or the date