diff --git a/timeago/src/main/java/com/github/kevinsawicki/timeago/Messages.java b/timeago/src/main/java/com/github/kevinsawicki/timeago/Messages.java
index cbd26af..d1a9c0f 100644
--- a/timeago/src/main/java/com/github/kevinsawicki/timeago/Messages.java
+++ b/timeago/src/main/java/com/github/kevinsawicki/timeago/Messages.java
@@ -50,4 +50,4 @@ public static String getString(String key) {
 			return '!' + key + '!';
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/timeago/src/main/java/com/github/kevinsawicki/timeago/TimeAgo.java b/timeago/src/main/java/com/github/kevinsawicki/timeago/TimeAgo.java
index 73d6496..5124433 100644
--- a/timeago/src/main/java/com/github/kevinsawicki/timeago/TimeAgo.java
+++ b/timeago/src/main/java/com/github/kevinsawicki/timeago/TimeAgo.java
@@ -432,4 +432,4 @@ public TimeAgo setYears(String years) {
 		this.years = years;
 		return this;
 	}
-}
+}
\ No newline at end of file
diff --git a/timeago/src/main/java/com/github/kevinsawicki/timeago/messages.properties b/timeago/src/main/java/com/github/kevinsawicki/timeago/messages.properties
index 3a2d588..ddfbf59 100644
--- a/timeago/src/main/java/com/github/kevinsawicki/timeago/messages.properties
+++ b/timeago/src/main/java/com/github/kevinsawicki/timeago/messages.properties
@@ -1,4 +1,8 @@
-TimeAgo.AGO=ago
+#en
+TimeAgo.PREFIX_AGO=
+TimeAgo.SUFFIX_AGO=ago
+TimeAgo.PREFIX_FROM_NOW=
+TimeAgo.SUFFIX_FROM_NOW=from now
 TimeAgo.DAY=a day
 TimeAgo.DAYS={0} days
 TimeAgo.HOUR=about an hour
@@ -8,6 +12,5 @@ TimeAgo.MINUTES={0} minutes
 TimeAgo.MONTH=about a month
 TimeAgo.MONTHS={0} months
 TimeAgo.SECONDS=less than a minute
-TimeAgo.SUFFIX_FROM_NOW=from now
 TimeAgo.YEAR=about a year
 TimeAgo.YEARS={0} years
diff --git a/timeago/src/main/java/com/github/kevinsawicki/timeago/messages_es_ES.properties b/timeago/src/main/java/com/github/kevinsawicki/timeago/messages_es_ES.properties
new file mode 100644
index 0000000..36f5a14
--- /dev/null
+++ b/timeago/src/main/java/com/github/kevinsawicki/timeago/messages_es_ES.properties
@@ -0,0 +1,15 @@
+TimeAgo.PREFIX_AGO=Hace
+TimeAgo.SUFFIX_AGO=
+TimeAgo.PREFIX_FROM_NOW=Dentro de
+TimeAgo.SUFFIX_FROM_NOW=
+TimeAgo.DAY=un día
+TimeAgo.DAYS={0} días
+TimeAgo.HOUR=aprox. una hora
+TimeAgo.HOURS={0} horas
+TimeAgo.MINUTE=aprox. un minuto
+TimeAgo.MINUTES={0} minutos
+TimeAgo.MONTH=aprox. un mes
+TimeAgo.MONTHS={0} meses
+TimeAgo.SECONDS=menos de un minuto
+TimeAgo.YEAR=aprox. un año
+TimeAgo.YEARS={0} años
\ No newline at end of file
diff --git a/timeago/src/main/java/com/github/kevinsawicki/timeago/messages_it_IT.properties b/timeago/src/main/java/com/github/kevinsawicki/timeago/messages_it_IT.properties
new file mode 100644
index 0000000..507aa88
--- /dev/null
+++ b/timeago/src/main/java/com/github/kevinsawicki/timeago/messages_it_IT.properties
@@ -0,0 +1,15 @@
+TimeAgo.PREFIX_AGO=
+TimeAgo.SUFFIX_AGO=fa
+TimeAgo.PREFIX_FROM_NOW=
+TimeAgo.SUFFIX_FROM_NOW=adesso
+TimeAgo.DAY=un giorno
+TimeAgo.DAYS={0} giorni
+TimeAgo.HOUR=circa un''ora
+TimeAgo.HOURS={0} ore
+TimeAgo.MINUTE=circa un minuto
+TimeAgo.MINUTES={0} minuti
+TimeAgo.MONTH=circa un mese
+TimeAgo.MONTHS={0} mesi
+TimeAgo.SECONDS=meno di un minuti
+TimeAgo.YEAR=circa un anno
+TimeAgo.YEARS={0} anni
diff --git a/timeago/src/test/java/com/github/kevinsawicki/timeago/tests/TimeAgoTest.java b/timeago/src/test/java/com/github/kevinsawicki/timeago/tests/TimeAgoTest.java
index 664a2ab..99b28d0 100644
--- a/timeago/src/test/java/com/github/kevinsawicki/timeago/tests/TimeAgoTest.java
+++ b/timeago/src/test/java/com/github/kevinsawicki/timeago/tests/TimeAgoTest.java
@@ -198,4 +198,4 @@ public void testYearsAgo() {
 						ago.getSuffixAgo());
 		assertEquals(expected, time);
 	}
-}
+}
\ No newline at end of file