The speculations of Messi's return to Barcelona are now hitting up and it seems likely that a move can happen in the summer as Barcelona President has mentioned that the club is talking to Messi's camp and discussions taking place already. I think Barcelona is also putting in place measures to satisfy every financial fair play rules if Messi is to join eventually.
Barcelona has considered everything wisely, they will not take any action that could harm the club. Bringing Messi back to Camp Nou is a management priority, Xavi has also started to actively build communication with Messi. The good relationship between the two was one of the reasons Messi returned to Camp Nou.
The first step Barcelona must take is increasing their finances to comply with financial fair play rules, Messi's salary is still too high, unless he lowers it to help the club that has made him what he is today.