Sort the Mail

#349190