Fix identity selection on reply (#1489291)