Dealing with emails with or in them and fix two-column bug