Go back to what you had previously. Mail should be practical. Stop trying to make it "pretty" - it isn't working and has no purpose.