Fixing message date issue and add support