mbox removing while true

It's not a great commit but I couldn't help myself while reading the code :)