Fix for issue #6 and one other error#3

dancysoft wants to merge 3 commits intokz26:masterkz26/mailproxy:masterfrom

dancysoft:masterdancysoft/mailproxy:masterCopy head branch name to clipboard