Merge pull request #15212 from surajshetty3416/fixes-and-improvements

Separate links for selling and buying messages