diff --git a/CHANGELOG.md b/CHANGELOG.md
index cecfe15..24bd4ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.4
+  * Handle spaces in ARB files where we didn't handle them before, and
+  where Google translation toolkit is now putting them.
+
 ## 0.12.3
 
   * Use latest version of 'analyzer' and 'args' packages.
diff --git a/lib/src/icu_parser.dart b/lib/src/icu_parser.dart
index c07934a..15c47b4 100644
--- a/lib/src/icu_parser.dart
+++ b/lib/src/icu_parser.dart
@@ -33,7 +33,7 @@
   get nonIcuMessageText => normalText.plus().map((x) => x.join());
   get twoSingleQuotes => string("''").map((x) => "'");
   get number => digit().plus().flatten().trim().map(int.parse);
-  get id => (letter() & (word() | char("_")).star()).flatten();
+  get id => (letter() & (word() | char("_")).star()).flatten().trim();
   get comma => char(",").trim();
 
   /**
diff --git a/pubspec.yaml b/pubspec.yaml
index c191723..cd7e41a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: intl
-version: 0.12.3
+version: 0.12.4
 author: Dart Team <misc@dartlang.org>
 description: Contains code to deal with internationalized/localized messages, date and number formatting and parsing, bi-directional text, and other internationalization issues.
 homepage: https://github.com/dart-lang/intl
diff --git a/test/message_extraction/make_hardcoded_translation.dart b/test/message_extraction/make_hardcoded_translation.dart
index af7d64d..4143fe8 100644
--- a/test/message_extraction/make_hardcoded_translation.dart
+++ b/test/message_extraction/make_hardcoded_translation.dart
@@ -62,7 +62,7 @@
       "}"
       "}",
   "outerPlural": "{n,plural, =0{rien}=1{un}other{quelques-uns}}",
-  "outerGender": "{g,select, male{homme}female{femme}other{autre}}",
+  "outerGender": "{g,select, male {homme} female {femme} other {autre}}",
   "pluralThatFailsParsing": "{noOfThings,plural, "
       "=1{1 chose:}other{{noOfThings} choses:}}",
   "nestedOuter": "{number,plural, other{"