importMessages + fixes