You already have the SaveUnique function from the previous macro. Add that function to the module and insert the line as indicated in the SaveAsPDFFile sub after the CreateFolders strSavePath line
CreateFolders strSavePath 'add this line to save the message as msg format SaveUnique olItem, strSavePath, strFileName