Some more fixes regarding mutt