Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/eu/siacs/conversations/entities/Message.java

2 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index 1a51edd5..5cf9dd7d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -175,6 +175,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
      */
     protected void displayMessageSentTime(View view, Message message) {
         TextView timeSent = (TextView) view.findViewById(R.id.dlgMsgDetTimeSent);
-        timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getMergedTimeSent())));
+        timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getTimeSent())));
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
index 81f5b843..f8310206 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
@@ -11,9 +11,10 @@ import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.persistance.FileBackend;
 
 /**
- * Created by tzur on 15.12.2015.
+ * Utility class to work with messages.
  */
 public final class MessageUtil {
+
     public static boolean wasHighlightedOrPrivate(final Message message) {
         final String nick = message.getConversation().getMucOptions().getActualNick();
         final Pattern highlight = generateNickHighlightPattern(nick);