diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 108ca802a..bab9d4b4d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -577,12 +577,11 @@ public class Helper {
long months = days / 30;
long years = days / 365;
+ String format = DateFormat.getDateInstance(DateFormat.SHORT).format(dateToot);
if( years > 0 ) {
- SimpleDateFormat format = new SimpleDateFormat("M/d/yy", Locale.getDefault());
- return format.format(dateToot);
+ return format;
} else if( months > 0 || days > 7) {
- SimpleDateFormat format = new SimpleDateFormat("M/d", Locale.getDefault());
- return format.format(dateToot);
+ return format.substring(0,5);
}else if( days > 0 )
return context.getString(R.string.date_day, days);
else if(hours > 0)
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 31001c09e..eeba5a26f 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -198,7 +198,7 @@