Fix warning in sbr/folder_addmsg.c by code cleanup