Email functionality change, search form