1 files changed, 13 insertions, 0 deletions

diff --git a/src/event.c b/src/event.c
index 486d724..0f71697 100644
--- a/src/event.c
+++ b/src/event.c
@@ -521,6 +521,9 @@ event_invitation(MESSENGER_Application *app,
 
   ui_chat_add_message(handle->chat, app, message);
 
+  if (app->settings.accept_all_invitations)
+    gtk_button_clicked(message->accept_button);
+
   enqueue_chat_entry_update(handle);
 }
 
@@ -534,9 +537,19 @@ event_receive_message(MESSENGER_Application *app,
   if (!handle)
     return;
 
+  const gboolean whispering = (
+      GNUNET_CHAT_KIND_WHISPER == GNUNET_CHAT_message_get_kind(msg)
+  );
+
+  if ((whispering) && (!(app->settings.show_whispering)))
+    return;
+
   const int sent = GNUNET_CHAT_message_is_sent(msg);
   const gchar *text = GNUNET_CHAT_message_get_text(msg);
 
+  if (whispering)
+    text = _("whispers...");
+
   if ((text) && (!(*text)))
     goto skip_message;