Comment 23 for bug 1241902

The code improved with the big help of Johan Engelen. I atemp to contact with him using my gmail account instead my main account, because a double bounce problems. Think Johan get it but if not, here is the last patch.