less chance of duplicate message ids
Merge pull request #67 from mmoadeli/MAID-BUG-FIX5

less chance of duplicate message ids