[#2253] Rearrange To/From fields and depend on is_recurring

fixes #2253