When They Were Last Together: The Queen's Justice (S7E3)
What Happened Then: Sam did what no one else dared try, and cured Jorah off his greyscale, saving his life in the process.
What Happens Now: While Jorah and Dany want to thank Sam for his help, things turn sour when it's revealed she killed his father and brother. Sam is backing Jon's claim to the Iron Throne for now, but we do know he'll help Jorah out more, as the trailers showed him with Heartsbane, the ancestral sword of House Tarly.