From 3e7c6e295169028b14d6da6a88ec6cc3a546b9bd Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 6 Oct 2013 19:16:20 +0100
Subject: [PATCH] Moved status display when receiveing delayed delivery

---
 src/ui/core.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ui/core.c b/src/ui/core.c
index 1fac0dc3..0d949361 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -297,16 +297,17 @@ ui_incoming_msg(const char * const from, const char * const message,
             _win_show_history(window->win, num, from);
         }
 
+        // show users status first, when receiving message via delayed delivery
+        if ((tv_stamp != NULL) && (win_created)) {
+            PContact pcontact = roster_get_contact(from);
+            if (pcontact != NULL) {
+                window->show_contact(window, pcontact);
+            }
+        }
+
         if (tv_stamp == NULL) {
             window->print_time(window, '-');
         } else {
-            // show users status first, when receiving message via delayed delivery
-            if (win_created) {
-                PContact pcontact = roster_get_contact(from);
-                if (pcontact != NULL) {
-                    window->show_contact(window, pcontact);
-                }
-            }
             GDateTime *time = g_date_time_new_from_timeval_utc(tv_stamp);
             gchar *date_fmt = g_date_time_format(time, "%H:%M:%S");
             wattron(window->win, COLOUR_TIME);