[#1434] email highlighting

Fixes #1434 

~~Currently have a failing spec where searches return different results depending on case, though since authoring I think this is an existing problem.~~

Came across #1558 while working on this.
Align the parameters of a method call if they span more than one line.<br>Use the new Ruby 1.9 hash syntax.<br>Line is too long. [155/80]