Arguing over text is the worst way to argue because the lack of tone decreases the meaning of the words. Talk it out in person.
Not only do most people enjoy humor, but it breaks the attention and stress caused by feeling angry and refocuses it on something less physiologically taxing.
One thing that has been shown to consistently combat anger is humor.
Men tend to handle there anger physically and impulsively, where women tend to be resentful and emotional.