An olive branch?

In Salem today, after Johnny is sent an FBI jacket, Sami and EJ have a few things to discuss. Meanwhile, Rafe and Calliope continue to work on Anna.