LPS-31845 Don't add subscription when previewing or saving a draft message
LPS-31845 Sort