Finally fixed it - tabbed messages that is.
Followed the instructions here and it all works fine. Basically deleted the session.json file in the profile directory.
(Hope I'm OK posting this link. It might help others with a similar or same problem).
https://support.mozilla.org/en-US/questions/1251632