Plugin SpamAssassin: add roundcube plugin markasjunk2 and some function changes