diff --git a/git_footers.py b/git_footers.py
index 05d1cbef3..a25e562ae 100755
--- a/git_footers.py
+++ b/git_footers.py
@@ -65,13 +65,7 @@ def split_footers(message):
       There could be fewer parsed_footers than footer lines if some lines in
       last paragraph are malformed.
   """
-  message_lines = list(message.splitlines())
-
-  # First, remove trailing empty lines from the change to get to the footer
-  while len(message_lines) > 0 and (message_lines[-1] == ''
-                                    or message_lines[-1].isspace()):
-    message_lines.pop()
-
+  message_lines = list(message.rstrip().splitlines())
   footer_lines = []
   maybe_footer_lines = []
   for line in reversed(message_lines):
diff --git a/tests/git_footers_test.py b/tests/git_footers_test.py
index e04354e45..4720b9d24 100755
--- a/tests/git_footers_test.py
+++ b/tests/git_footers_test.py
@@ -46,9 +46,15 @@ My commit message is my best friend. It is my life. I must master it.
         git_footers.split_footers('H\n\nBug:\nAlso: footer'),
         (['H', ''], ['Bug:', 'Also: footer'],
          [('Bug', ''), ('Also', 'footer')]))
+    self.assertEqual(git_footers.split_footers('H\n\nBug:      '),
+                     (['H', ''], ['Bug:'], [('Bug', '')]))
+    self.assertEqual(git_footers.split_footers('H\n\nBug: 1234     '),
+                     (['H', ''], ['Bug: 1234'], [('Bug', '1234')]))
     self.assertEqual(
-        git_footers.split_footers('H\n\nBug:      '),
-        (['H', ''], ['Bug:      '], [('Bug', '')]))
+        git_footers.split_footers('H\n\nBug: 1234\nChange-Id: Ib4321  '),
+        (['H', ''], ['Bug: 1234', 'Change-Id: Ib4321'], [('Bug', '1234'),
+                                                         ('Change-Id', 'Ib4321')
+                                                         ]))
 
     self.assertEqual(
         git_footers.parse_footers(self._message), {})