[IMP] Improved behavior of separator snippet for all themes and unsubscribe link