Reply and compose working a lot better