Moved variable declaration
Added supoprt for mutt files