diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9fcd9dfa0561e5d585011f61108f19618c79dbd4..11c5224e6e4c5ceae3232ea599e99e746003cec8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -236,7 +236,7 @@
     <string name="hours">hours</string>
     <string name="mins">mins</string>
     <string name="missing_public_keys">Missing public key announcements</string>
-    <string name="last_seen_now">last seen %d ago</string>
+    <string name="last_seen_now">last seen just now</string>
     <string name="last_seen_mins">last seen %d minutes ago</string>
     <string name="last_seen_hours">last seen %d hours ago</string>
     <string name="last_seen_days">last seen %d days ago</string>
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 3d6f4ceab7de29d6b2a555345feecff564c1dd58..d0ea4828bb6f7750cf501c8c20b935114ddf2777 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -78,7 +78,7 @@ public class UIHelper {
 		}
 		long difference = (System.currentTimeMillis() - time) / 1000;
 		if (difference < 60) {
-			return context.getString(R.string.just_now);
+			return context.getString(R.string.last_seen_now);
 		} else if (difference < 60 * 90) {
 			return context.getString(R.string.last_seen_mins,difference/60);
 		} else if (difference < 60 * 60 * 36) {