Fix new case with no attachments redirect bug
Merge branch 'redirect_bug'