diff --git a/filediff.py b/filediff.py
index dc5a21b..1074fc7 100644
--- a/filediff.py
+++ b/filediff.py
@@ -104,6 +104,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                                             foreground = self.prefs.color_conflict_fg)
             buf.create_tag("inline line",   background = self.prefs.color_inline_bg,
                                             foreground = self.prefs.color_inline_fg)
+            buf.create_tag("whitespace EOL",background = self.prefs.color_wseol_bg)
 
         def parse_to_cairo(color_spec):
             color = gdk.color_parse(color_spec)
@@ -628,6 +629,13 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             for tagname in taglist:
                 tag = table.lookup(tagname)
                 b.remove_tag(tag, b.get_start_iter(), b.get_end_iter() )
+            line_nr = 0
+            for line in b.get_text(b.get_start_iter(), b.get_end_iter()).split('\n'):
+                if line.endswith(' '):
+                    b.apply_tag(b.get_tag_table().lookup("whitespace EOL"),
+                                b.get_iter_at_line_offset(line_nr, len(line.rstrip())),
+                                b.get_iter_at_line_offset(line_nr, len(line)))
+                line_nr += 1
         for chunk in self.linediffer.all_changes():
             for i,c in enumerate(chunk):
                 if c and c[0] == "replace":
diff --git a/meldapp.py b/meldapp.py
index f6ce0ab..bf99de4 100644
--- a/meldapp.py
+++ b/meldapp.py
@@ -336,6 +336,7 @@ class MeldPreferences(prefs.Preferences):
         "color_inline_fg" : prefs.Value(prefs.STRING, "Red"),
         "color_edited_bg" : prefs.Value(prefs.STRING, "gray90"),
         "color_edited_fg" : prefs.Value(prefs.STRING, "Black"),
+        "color_wseol_bg" : prefs.Value(prefs.STRING, "Red"),
         "filters" : prefs.Value(prefs.STRING,
             #TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
             _("Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n") + \
