26 files changed, 410 insertions, 229 deletions

diff --git a/.gitignore b/.gitignore
index 363d75a..8f8cabf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,26 @@
+.version
+
+aclocal.m4
+autom4te.cache/
+build-aux/
+
+config.log
+config.status
+configure
+configure~
+
+libtool
+m4/
+
+Makefile.in
+Makefile
+
 # IDE specific files:
 .cproject
 .project
 .settings/
+.cache/
+.vscode/
 
 # Binary files:
 *.o
diff --git a/CHANGES.md b/ChangeLog
index d800b24..ef9fb5e 100644
--- a/CHANGES.md
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+## Version 0.1.1
+* Replaces build system finally with Meson increasing platform support
+* Fixes issues regarding changes in header usage from GNUnet 0.19.0
+
 ## Version 0.1.0
 * It is possible to create direct chats and group chats via lobbies, shared keys or invitations
 * Members of a chats can be observed
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 66bb7e2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-
-VERSION         = 0.1.0
-TARGET_NAME     = messenger-cli
-
-SOURCE_DIR  = src/
-INSTALL_DIR ?= /usr/local/
-
-PACKAGE = $(TARGET_NAME)
-BINARY  = $(TARGET_NAME)
-SOURCES = messenger_cli.c\
-          application.c\
-          chat.c\
-          util.c\
-          ui/account_create_dialog.c\
-          ui/accounts.c\
-          ui/chat_open_dialog.c\
-          ui/chats.c\
-          ui/lobby_create_dialog.c\
-          ui/lobby_enter_dialog.c\
-          ui/members.c\
-          ui/messages.c
-HEADERS = application.h\
-          chat.h\
-          util.h\
-          ui/account_create_dialog.h\
-          ui/accounts.h\
-          ui/chat.h\
-          ui/chat_open_dialog.h\
-          ui/chats.h\
-          ui/list_input.h\
-          ui/lobby_create_dialog.h\
-          ui/lobby_enter_dialog.h\
-          ui/members.h\
-          ui/messages.h\
-          ui/text_input.h
-
-LIBRARIES = gnunetchat gnunetutil ncurses
-
-DIST_FILES = Makefile\
-                         AUTHORS\
-                         CHANGES.md\
-                         COPYING\
-                         README.md
-
-GNU_CC  ?= gcc
-GNU_LD  ?= gcc
-GNU_RM  ?= rm
-GNU_CP  ?= cp
-GNU_TAR ?= tar
-
-CFLAGS  += -pedantic -Wall -Wextra -ggdb3 -Wno-overlength-strings
-LDFLAGS += 
-
-DEBUGFLAGS   = -O0 -D _DEBUG
-RELEASEFLAGS = -O2 -D NDEBUG
-
-DIST_DIR = $(PACKAGE)-$(VERSION)/
-DIST_TAR = $(PACKAGE)-$(VERSION).tar.gz
-
-SOURCE_FILES  = $(addprefix $(SOURCE_DIR), $(SOURCES))
-OBJECT_FILES  = $(SOURCE_FILES:%.c=%.o)
-HEADER_FILES  = $(addprefix $(SOURCE_DIR), $(HEADERS))
-LIBRARY_FLAGS = $(addprefix -l, $(LIBRARIES))
-
-all: $(BINARY)
-
-debug: CFLAGS += $(DEBUGFLAGS)
-debug: $(BINARY)
-
-release: CFLAGS += $(RELEASEFLAGS)
-release: $(BINARY)
-
-%.o: %.c
-        $(GNU_CC) $(CFLAGS) -c $< -o $@
-
-$(BINARY): $(OBJECT_FILES)
-        $(GNU_LD) $(LDFLAGS) $^ -o $@ $(LIBRARY_FLAGS)
-
-.PHONY: install
-
-install:
-        install -m 755 $(BINARY) $(addprefix $(INSTALL_DIR), bin/)
-
-.PHONY: uninstall
-
-uninstall:
-        $(GNU_RM) -f $(addsuffix $(BINARY), $(addprefix $(INSTALL_DIR), bin/))
-
-.PHONY: dist
-
-dist: clean
-        mkdir $(DIST_DIR)
-        $(GNU_CP) -r $(SOURCE_DIR) $(DIST_DIR)
-        $(foreach DIST_FILE,$(DIST_FILES),$(GNU_CP) $(DIST_FILE) $(addprefix $(DIST_DIR), $(DIST_FILE));)
-        $(GNU_TAR) -czf $(DIST_TAR) $(DIST_DIR)
-        $(GNU_RM) -r $(DIST_DIR)
-
-.PHONY: clean
-
-clean:
-        $(GNU_RM) -f $(BINARY)
-        $(GNU_RM) -f $(OBJECT_FILES)
diff --git a/README.md b/README.md
index 37d95e4..4a5bf35 100644
--- a/README.md
+++ b/README.md
@@ -24,13 +24,21 @@ The following dependencies are required and need to be installed to build the ap
  - [libgnunetchat](https://git.gnunet.org/libgnunetchat.git/): For chatting via GNUnet messenger
  - [ncurses](https://www.gnu.org/software/ncurses/): For the general UI visualization
 
-Then you can simply use the provided Makefile as follows:
+Then you can simply use [Meson](https://mesonbuild.com/) as follows:
+```
+meson build            # Configure the build files for your system
+ninja -C build         # Build the application using those build files
+ninja -C build install # Install the application
+```
+
+Here is a list of some useful build commands using Meson and [Ninja](https://ninja-build.org/):
+
+ - `meson compile -C build` to just compile everything with configured parameters
+ - `rm -r build` to cleanup build files in case you want to recompile
+ - `meson install -C build` to install the compiled files (you might need sudo permissions to install)
+ - `meson dist -C build` to create a tar file for distribution
 
- - `make` to just compile everything with default parameters
- - `make clean` to cleanup build files in case you want to recompile
- - `make debug` to compile everything with debug parameters
- - `make release` to compile everything with build optimizations enabled
- - `make install` to install the compiled files (you might need sudo permissions to install)
+If you want to change the installation location, use the `--prefix=` parameter in the initial meson command. Also you can enable optimized release builds by adding `--buildtype=release` as parameter.
 
 ## Contribution
 
diff --git a/contrib/distribute_version.sh b/contrib/distribute_version.sh
new file mode 100644
index 0000000..110d311
--- /dev/null
+++ b/contrib/distribute_version.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+VERSION=$1
+cd "${MESON_DIST_ROOT}"
+echo $VERSION > .version
\ No newline at end of file
diff --git a/contrib/get_version.sh b/contrib/get_version.sh
new file mode 100644
index 0000000..2a41ed4
--- /dev/null
+++ b/contrib/get_version.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Gets the version number from git, or from the contents of .version
+VERSION=
+if test -f ".version"
+then
+  VERSION=$(cat .version)
+fi
+if test -d "./.git"
+then
+  VERSION=$(git describe --tags)
+  VERSION=${VERSION#v}
+  echo $VERSION > .version
+fi
+if test "x$VERSION" = "x"
+then
+  VERSION="unknown"
+fi
+echo "$VERSION"
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..d46f2f9
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,52 @@
+#
+# This file is part of GNUnet.
+# Copyright (C) 2023--2024 GNUnet e.V.
+#
+# GNUnet is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: AGPL3.0-or-later
+#
+
+project(
+    'messenger-cli',
+    'c',
+    license: 'AGPL3.0-or-later',
+    version: run_command('contrib/get_version.sh').stdout().strip(),
+)
+
+meson.add_dist_script('contrib/distribute_version.sh', meson.project_version())
+
+src_directory = include_directories('src')
+
+messenger_cli_deps = [
+    dependency('gnunetchat'),
+    dependency('gnunetutil'),
+    dependency('ncurses'),
+]
+
+messenger_cli_args = [
+    '-DMESSENGER_CLI_BINARY="@0@"'.format(meson.project_name()),
+    '-DMESSENGER_CLI_VERSION="@0@"'.format(meson.project_version()),
+]
+
+subdir('src')
+
+messenger_cli_exec = executable(
+    'messenger-cli',
+    messenger_cli_sources,
+    c_args: messenger_cli_args,
+    install: true,
+    dependencies: messenger_cli_deps,
+    include_directories: src_directory,
+)
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..937a67b
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,14 @@
+.deps/
+.libs/
+
+Makefile.in
+Makefile
+
+stamp-h1
+
+messenger_cli_config.h
+messenger_cli_config.h.in
+messenger_cli_config.h.in~
+
+*.o
+*.a
diff --git a/src/application.c b/src/application.c
index d8314df..1b2bdbd 100644
--- a/src/application.c
+++ b/src/application.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -24,6 +24,20 @@
 
 #include "application.h"
 
+#include "util.h"
+
+#ifndef MESSENGER_CLI_BINARY
+#define MESSENGER_CLI_BINARY "messenger_cli"
+#endif
+
+#ifndef MESSENGER_CLI_VERSION
+#define MESSENGER_CLI_VERSION "unknown"
+#endif
+
+#ifndef MESSENGER_CLI_DESC
+#define MESSENGER_CLI_DESC "A CLI for the Messenger service of GNUnet."
+#endif
+
 void
 application_clear(MESSENGER_Application *app)
 {
@@ -35,14 +49,34 @@ application_clear(MESSENGER_Application *app)
 
 void
 application_init(MESSENGER_Application *app,
-                 int argc,
-                 char **argv)
+                 int argc,
+                 char **argv)
 {
+  const struct GNUNET_GETOPT_CommandLineOption options [] = {
+    GNUNET_GETOPT_option_version(MESSENGER_CLI_VERSION),
+    GNUNET_GETOPT_option_help(MESSENGER_CLI_DESC),
+    GNUNET_GETOPT_OPTION_END
+  };
+
   memset(app, 0, sizeof(*app));
 
   app->argc = argc;
   app->argv = argv;
 
+  const int parsing = GNUNET_GETOPT_run(
+    MESSENGER_CLI_BINARY,
+    options,
+    app->argc,
+    app->argv
+  );
+
+  if (parsing <= 0)
+  {
+    app->window = NULL;
+    app->status = GNUNET_SYSERR == parsing? GNUNET_SYSERR : GNUNET_OK;
+    return;
+  }
+
   app->window = initscr();
 
   if (!(app->window))
@@ -90,18 +124,18 @@ run (void *cls,
 void
 application_run(MESSENGER_Application *app)
 {
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-      GNUNET_GETOPT_OPTION_END
+  const struct GNUNET_GETOPT_CommandLineOption options [] = {
+    GNUNET_GETOPT_OPTION_END
   };
 
   app->status = GNUNET_PROGRAM_run(
-      app->argc,
-      app->argv,
-      "messenger_cli",
-      gettext_noop("A CLI for the Messenger service of GNUnet."),
-      options,
-      &run,
-      app
+    1,
+    app->argv,
+    MESSENGER_CLI_BINARY,
+    gettext_noop(MESSENGER_CLI_DESC),
+    options,
+    &run,
+    app
   );
 
   members_clear(&(app->current.members));
diff --git a/src/application.h b/src/application.h
index ea248e0..2ed9ea4 100644
--- a/src/application.h
+++ b/src/application.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -29,7 +29,6 @@
 #include <curses.h>
 
 #include "chat.h"
-#include "util.h"
 
 #include "ui/accounts.h"
 #include "ui/chat.h"
diff --git a/src/chat.c b/src/chat.c
index a0073d9..792f8eb 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -26,6 +26,16 @@
 
 #include "application.h"
 #include "util.h"
+#include <curses.h>
+#include <gnunet/gnunet_chat_lib.h>
+
+#ifndef MESSENGER_CLI_BINARY
+#define MESSENGER_CLI_BINARY "messenger_cli"
+#endif
+
+#ifndef MESSENGER_CLI_VERSION
+#define MESSENGER_CLI_VERSION "unknown"
+#endif
 
 static void
 _chat_refresh(MESSENGER_Application *app)
@@ -45,6 +55,14 @@ _chat_refresh(MESSENGER_Application *app)
   wmove(app->ui.logo, 0, 0);
 
   util_print_logo(app->ui.logo);
+
+  int x = getcurx(app->ui.logo);
+  int y = getcury(app->ui.logo);
+
+  util_print_info(app->ui.logo, MESSENGER_CLI_VERSION);
+
+  wmove(app->ui.logo, --y, x);
+  util_print_info(app->ui.logo, MESSENGER_CLI_BINARY);
 }
 
 static bool
@@ -357,6 +375,8 @@ chat_process_message(UNUSED MESSENGER_Chat *chat,
         &(current->messages),
         GNUNET_CHAT_message_get_target(message)
     );
+  else if (GNUNET_YES == GNUNET_CHAT_message_is_deleted(message))
+    messages_remove(&(current->messages), message);
   else if ((GNUNET_CHAT_KIND_JOIN != kind) || (new_member))
     messages_add(&(current->messages), message);
 }
diff --git a/src/chat.h b/src/chat.h
index 7eb103f..00c01f1 100644
--- a/src/chat.h
+++ b/src/chat.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -25,7 +25,6 @@
 #ifndef CHAT_H_
 #define CHAT_H_
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..1d98bea
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,28 @@
+#
+# This file is part of GNUnet.
+# Copyright (C) 2023 GNUnet e.V.
+#
+# GNUnet is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: AGPL3.0-or-later
+#
+
+subdir('ui')
+
+messenger_cli_sources = files([
+    'application.c', 'application.h',
+    'chat.c', 'chat.h',
+    'util.c', 'util.h',
+    'messenger_cli.c',
+]) + messenger_cli_ui_sources
diff --git a/src/ui/account_create_dialog.c b/src/ui/account_create_dialog.c
index 1ef6568..6845a1d 100644
--- a/src/ui/account_create_dialog.c
+++ b/src/ui/account_create_dialog.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -24,13 +24,11 @@
 
 #include "account_create_dialog.h"
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
 #include "text_input.h"
 #include "../application.h"
-#include "../util.h"
 
 void
 account_create_dialog_event(UI_ACCOUNT_CREATE_DIALOG_Handle *create_dialog,
diff --git a/src/ui/accounts.h b/src/ui/accounts.h
index 2566e78..392f476 100644
--- a/src/ui/accounts.h
+++ b/src/ui/accounts.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <curses.h>
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/ui/chat_open_dialog.c b/src/ui/chat_open_dialog.c
index cd98401..1ea5863 100644
--- a/src/ui/chat_open_dialog.c
+++ b/src/ui/chat_open_dialog.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -24,13 +24,11 @@
 
 #include "chat_open_dialog.h"
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
 #include "text_input.h"
 #include "../application.h"
-#include "../util.h"
 
 void
 chat_open_dialog_event(UI_CHAT_OPEN_DIALOG_Handle *open_dialog,
diff --git a/src/ui/chats.c b/src/ui/chats.c
index 55e08df..5889dd4 100644
--- a/src/ui/chats.c
+++ b/src/ui/chats.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -27,8 +27,10 @@
 #include "list_input.h"
 #include "../application.h"
 #include "../util.h"
+#include <gnunet/gnunet_chat_lib.h>
+#include <gnunet/gnunet_common.h>
 
-static int
+static enum GNUNET_GenericReturnValue
 _chats_iterate_group(void *cls,
                      UNUSED struct GNUNET_CHAT_Handle *handle,
                      struct GNUNET_CHAT_Group *group)
@@ -38,17 +40,21 @@ _chats_iterate_group(void *cls,
   return GNUNET_YES;
 }
 
-static int
+static enum GNUNET_GenericReturnValue
 _chats_iterate_contact(void *cls,
                        UNUSED struct GNUNET_CHAT_Handle *handle,
                        struct GNUNET_CHAT_Contact *contact)
 {
   UI_CHATS_Handle *chats = cls;
+
+  if (GNUNET_YES == GNUNET_CHAT_contact_is_owned(contact))
+    return GNUNET_YES;
+
   list_input_select(chats, 1, GNUNET_CHAT_contact_get_context(contact));
   return GNUNET_YES;
 }
 
-static int
+static enum GNUNET_GenericReturnValue
 _chats_iterate_messages(void *cls,
                         struct GNUNET_CHAT_Context *context,
                         const struct GNUNET_CHAT_Message *message)
@@ -165,7 +171,7 @@ _chats_print_entry(UI_CHATS_Handle *chats,
   return GNUNET_YES;
 }
 
-int
+enum GNUNET_GenericReturnValue
 _chats_iterate_print_group(void *cls,
                            UNUSED struct GNUNET_CHAT_Handle *handle,
                            struct GNUNET_CHAT_Group *group)
@@ -175,12 +181,16 @@ _chats_iterate_print_group(void *cls,
   return _chats_print_entry(chats, 'x', 'G', name);
 }
 
-int
+enum GNUNET_GenericReturnValue
 _chats_iterate_print_contact(void *cls,
                              UNUSED struct GNUNET_CHAT_Handle *handle,
                              struct GNUNET_CHAT_Contact *contact)
 {
   UI_CHATS_Handle *chats = cls;
+
+  if (GNUNET_YES == GNUNET_CHAT_contact_is_owned(contact))
+    return GNUNET_YES;
+
   const char *name = GNUNET_CHAT_contact_get_name(contact);
   return _chats_print_entry(chats, 'x', 'C', name);
 }
diff --git a/src/ui/chats.h b/src/ui/chats.h
index 7ab64d5..eb0ba99 100644
--- a/src/ui/chats.h
+++ b/src/ui/chats.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <curses.h>
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/ui/lobby_create_dialog.h b/src/ui/lobby_create_dialog.h
index 42d06fc..4ec5501 100644
--- a/src/ui/lobby_create_dialog.h
+++ b/src/ui/lobby_create_dialog.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <curses.h>
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/ui/lobby_enter_dialog.c b/src/ui/lobby_enter_dialog.c
index 0ae9018..a3ef356 100644
--- a/src/ui/lobby_enter_dialog.c
+++ b/src/ui/lobby_enter_dialog.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -24,13 +24,11 @@
 
 #include "lobby_enter_dialog.h"
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
 #include "text_input.h"
 #include "../application.h"
-#include "../util.h"
 
 void
 lobby_enter_dialog_event(UI_LOBBY_ENTER_DIALOG_Handle *enter_dialog,
diff --git a/src/ui/members.h b/src/ui/members.h
index 7769e74..9ff3078 100644
--- a/src/ui/members.h
+++ b/src/ui/members.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <curses.h>
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/ui/meson.build b/src/ui/meson.build
new file mode 100644
index 0000000..a57c670
--- /dev/null
+++ b/src/ui/meson.build
@@ -0,0 +1,33 @@
+#
+# This file is part of GNUnet.
+# Copyright (C) 2023 GNUnet e.V.
+#
+# GNUnet is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# SPDX-License-Identifier: AGPL3.0-or-later
+#
+
+messenger_cli_ui_sources = files([
+    'account_create_dialog.c', 'account_create_dialog.h',
+    'accounts.c', 'accounts.h',
+    'chat_open_dialog.c', 'chat_open_dialog.h',
+    'chat.h',
+    'chats.c', 'chats.h',
+    'list_input.h',
+    'lobby_create_dialog.c', 'lobby_create_dialog.h',
+    'lobby_enter_dialog.c', 'lobby_enter_dialog.h',
+    'members.c', 'members.h',
+    'messages.c', 'messages.h',
+    'text_input.h',
+])
diff --git a/src/ui/messages.c b/src/ui/messages.c
index 8bfd934..1dea885 100644
--- a/src/ui/messages.c
+++ b/src/ui/messages.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -28,10 +28,12 @@
 #include "text_input.h"
 #include "../application.h"
 #include "../util.h"
+#include <gnunet/gnunet_chat_lib.h>
+#include <gnunet/gnunet_common.h>
 
 struct tm*
 _messages_new_day(time_t* current_time,
-                  const time_t* timestamp)
+                              const time_t* timestamp)
 {
   struct tm* ts = localtime(timestamp);
 
@@ -57,21 +59,21 @@ _messages_handle_message(UI_MESSAGES_Handle *messages)
     case GNUNET_CHAT_KIND_INVITATION:
     {
       struct GNUNET_CHAT_Invitation *invitation = (
-          GNUNET_CHAT_message_get_invitation(messages->selected)
+              GNUNET_CHAT_message_get_invitation(messages->selected)
       );
 
       if (invitation)
-        GNUNET_CHAT_invitation_accept(invitation);
+              GNUNET_CHAT_invitation_accept(invitation);
       break;
     }
     case GNUNET_CHAT_KIND_FILE:
     {
       struct GNUNET_CHAT_File *file = GNUNET_CHAT_message_get_file(
-          messages->selected
+              messages->selected
       );
 
       if ((file) && (GNUNET_YES != GNUNET_CHAT_file_is_downloading(file)))
-        GNUNET_CHAT_file_start_download(file, NULL, NULL);
+              GNUNET_CHAT_file_start_download(file, NULL, NULL);
       break;
     default:
       break;
@@ -81,8 +83,8 @@ _messages_handle_message(UI_MESSAGES_Handle *messages)
 
 void
 messages_event(UI_MESSAGES_Handle *messages,
-               MESSENGER_Application *app,
-               int key)
+               MESSENGER_Application *app,
+               int key)
 {
   list_input_reset(messages);
   messages->line_time = 0;
@@ -91,8 +93,8 @@ messages_event(UI_MESSAGES_Handle *messages,
   while (element)
   {
     struct tm *ts = _messages_new_day(
-        &(messages->line_time),
-        &(element->timestamp)
+      &(messages->line_time),
+      &(element->timestamp)
     );
 
     list_input_select(messages, ts? 2 : 1, element->message);
@@ -113,44 +115,44 @@ messages_event(UI_MESSAGES_Handle *messages,
     case '\n':
     case KEY_ENTER:
       if (messages->selected)
-        _messages_handle_message(messages);
+              _messages_handle_message(messages);
       else if (messages->text_len > 0)
       {
-        if (0 != strncmp(messages->text,
-                         UI_MESSAGES_FILE_PREFIX,
-                         UI_MESSAGES_FILE_PREFIX_LEN))
-          goto write_text;
+              if (0 != strncmp(messages->text,
+                      UI_MESSAGES_FILE_PREFIX,
+                      UI_MESSAGES_FILE_PREFIX_LEN))
+                goto write_text;
 
-        const char* filename = messages->text + 5;
+              const char* filename = messages->text + 5;
 
-        if (0 != access(filename, R_OK | F_OK))
-          break;
+        if (0 != access(filename, R_OK | F_OK))
+          break;
 
-        GNUNET_CHAT_context_send_file(
-            app->chat.context,
-            filename,
-            NULL,
-            NULL
-        );
+        GNUNET_CHAT_context_send_file(
+          app->chat.context,
+          filename,
+          NULL,
+          NULL
+        );
 
-        goto drop_text;
+              goto drop_text;
 
       write_text:
-        GNUNET_CHAT_context_send_text(
-            app->chat.context,
-            messages->text
-        );
+        GNUNET_CHAT_context_send_text(
+          app->chat.context,
+          messages->text
+        );
 
       drop_text:
-        messages->text_len = 0;
+              messages->text_len = 0;
       }
       break;
     case KEY_BACKSPACE:
       if (messages->selected)
-        GNUNET_CHAT_message_delete(
-            messages->selected,
-            GNUNET_TIME_relative_get_zero_()
-        );
+              GNUNET_CHAT_message_delete(
+          messages->selected,
+          GNUNET_TIME_relative_get_zero_()
+              );
       break;
     default:
       break;
@@ -164,14 +166,30 @@ messages_event(UI_MESSAGES_Handle *messages,
 
 void
 _messages_iterate_print(UI_MESSAGES_Handle *messages,
-                        const time_t* timestamp,
-                        const struct GNUNET_CHAT_Message *message)
+                        const time_t* timestamp,
+                        const struct GNUNET_CHAT_Message *message)
 {
+  static const char *you = "you";
+
   enum GNUNET_CHAT_MessageKind kind = GNUNET_CHAT_message_get_kind(message);
 
   struct GNUNET_CHAT_Contact *sender = GNUNET_CHAT_message_get_sender(message);
+  struct GNUNET_CHAT_Contact *recipient = GNUNET_CHAT_message_get_recipient(message);
+
+  enum GNUNET_GenericReturnValue sent = GNUNET_CHAT_message_is_sent(message);
+  const char *msg_s = GNUNET_YES == sent? "" : "s";
+
+  enum GNUNET_GenericReturnValue recv = recipient? 
+    GNUNET_CHAT_contact_is_owned(recipient) : GNUNET_NO;
+
+  const char *name = GNUNET_YES == sent? you : (
+    sender? GNUNET_CHAT_contact_get_name(sender) : NULL
+  );
+
+  const char *rcp = GNUNET_YES == recv? you : (
+    recipient? GNUNET_CHAT_contact_get_name(recipient) : you
+  );
 
-  const char *name = sender? GNUNET_CHAT_contact_get_name(sender) : NULL;
   const char *text = GNUNET_CHAT_message_get_text(message);
 
   const struct GNUNET_CHAT_File *file = GNUNET_CHAT_message_get_file(message);
@@ -209,31 +227,35 @@ _messages_iterate_print(UI_MESSAGES_Handle *messages,
   switch (kind) {
     case GNUNET_CHAT_KIND_JOIN:
       wprintw(
-          messages->window,
-          "%s joins the room.",
-          name
+        messages->window,
+        "%s join%s the room.",
+        name,
+        msg_s
       );
       break;
     case GNUNET_CHAT_KIND_LEAVE:
       wprintw(
-            messages->window,
-            "%s leaves the room.",
-            name
+        messages->window,
+        "%s leave%s the room.",
+        name,
+        msg_s
       );
       break;
     case GNUNET_CHAT_KIND_INVITATION:
       wprintw(
-            messages->window,
-            "%s invites you to a room.",
-            name
+        messages->window,
+        "%s invite%s %s to a room.",
+        name,
+        msg_s,
+        rcp
       );
       break;
     case GNUNET_CHAT_KIND_TEXT:
       wprintw(
-          messages->window,
-          "%s: %s",
-          name,
-          text
+              messages->window,
+        "%s: %s",
+        name,
+        text
       );
       break;
     case GNUNET_CHAT_KIND_FILE: {
@@ -243,22 +265,23 @@ _messages_iterate_print(UI_MESSAGES_Handle *messages,
       const uint64_t filesize = GNUNET_CHAT_file_get_size(file);
 
       wprintw(
-          messages->window,
-          "%s shares the file '%s' (%lu / %lu) with you.",
-          name,
-          filename,
-          localsize,
-          filesize
+        messages->window,
+        "%s share%s the file '%s' (%lu / %lu).",
+        name,
+        msg_s,
+        filename,
+        localsize,
+        filesize
       );
       break;
     }
     default:
       wprintw(
-          messages->window,
-          "[%d] %s: %s",
-          (int) kind,
-          name,
-          text
+        messages->window,
+        "[%d] %s: %s",
+        (int) kind,
+        name,
+        text
       );
       break;
   }
@@ -295,9 +318,9 @@ messages_print(UI_MESSAGES_Handle *messages)
   whline(messages->window, '-', width);
 
   const bool is_file_text = (0 == strncmp(
-      messages->text,
-      UI_MESSAGES_FILE_PREFIX,
-      UI_MESSAGES_FILE_PREFIX_LEN
+    messages->text,
+    UI_MESSAGES_FILE_PREFIX,
+    UI_MESSAGES_FILE_PREFIX_LEN
   ));
 
   const int attrs_select = A_BOLD | (is_file_text? A_ITALIC : A_NORMAL);
@@ -327,9 +350,9 @@ messages_clear(UI_MESSAGES_Handle *messages)
     element = messages->head;
 
     GNUNET_CONTAINER_DLL_remove(
-        messages->head,
-        messages->tail,
-        element
+      messages->head,
+      messages->tail,
+      element
     );
 
     GNUNET_free(element);
@@ -338,8 +361,8 @@ messages_clear(UI_MESSAGES_Handle *messages)
 
 static int
 _message_compare_timestamps(UNUSED void *cls,
-                            UI_MESSAGES_List *list0,
-                            UI_MESSAGES_List *list1)
+                            UI_MESSAGES_List *list0,
+                            UI_MESSAGES_List *list1)
 {
   if ((!list0) || (!list1))
     return 0;
@@ -354,13 +377,13 @@ _message_compare_timestamps(UNUSED void *cls,
 
 void
 messages_add(UI_MESSAGES_Handle *messages,
-             const struct GNUNET_CHAT_Message *message)
+                   const struct GNUNET_CHAT_Message *message)
 {
   enum GNUNET_CHAT_MessageKind kind = GNUNET_CHAT_message_get_kind(message);
 
   switch (kind) {
+    case GNUNET_CHAT_KIND_UPDATE:
     case GNUNET_CHAT_KIND_CONTACT:
-    case GNUNET_CHAT_KIND_WHISPER:
     case GNUNET_CHAT_KIND_DELETION:
       return;
     default:
@@ -385,11 +408,11 @@ messages_add(UI_MESSAGES_Handle *messages,
   list_input_select(messages, 1, NULL);
 
   const struct GNUNET_TIME_Absolute abs_time = (
-      GNUNET_CHAT_message_get_timestamp(message)
+    GNUNET_CHAT_message_get_timestamp(message)
   );
 
   const struct GNUNET_TIME_Timestamp timestamp = (
-      GNUNET_TIME_absolute_to_timestamp(abs_time)
+    GNUNET_TIME_absolute_to_timestamp(abs_time)
   );
 
   element = GNUNET_new(UI_MESSAGES_List);
@@ -413,7 +436,7 @@ messages_add(UI_MESSAGES_Handle *messages,
 
 void
 messages_remove(UI_MESSAGES_Handle *messages,
-                const struct GNUNET_CHAT_Message *message)
+                      const struct GNUNET_CHAT_Message *message)
 {
   UI_MESSAGES_List *element = messages->head;
   while (element)
@@ -426,8 +449,8 @@ messages_remove(UI_MESSAGES_Handle *messages,
 
   if (element)
     GNUNET_CONTAINER_DLL_remove(
-        messages->head,
-        messages->tail,
-        element
+      messages->head,
+      messages->tail,
+      element
     );
 }
diff --git a/src/ui/messages.h b/src/ui/messages.h
index 3d509db..bcb2336 100644
--- a/src/ui/messages.h
+++ b/src/ui/messages.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2023 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -26,9 +26,10 @@
 #define UI_MESSAGES_H_
 
 #include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
 #include <curses.h>
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_chat_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/util.c b/src/util.c
index 6647fef..89155c8 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -23,6 +23,7 @@
  */
 
 #include "util.h"
+#include <string.h>
 
 void
 util_print_logo(WINDOW *window)
@@ -41,3 +42,18 @@ util_print_logo(WINDOW *window)
   wmove(window, y++, x); wprintw(window, "            oooo            ");
   wmove(window, y++, x); wprintw(window, "                            ");
 }
+
+void
+util_print_info(WINDOW *window,
+                const char *info)
+{
+  const int x = getmaxx(window) - strlen(info) - 1;
+  const int y = getcury(window);
+
+  if ((x + (y - 2) / 2 < UTIL_LOGO_COLS - 7) ||
+      ((y < 4) && (x < UTIL_LOGO_COLS)))
+    return;
+
+  wmove(window, y, x);
+  wprintw(window, "%s", info);
+}
diff --git a/src/util.h b/src/util.h
index ba4c735..d1126a9 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2022 GNUnet e.V.
+   Copyright (C) 2022--2024 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -43,4 +43,15 @@
 void
 util_print_logo(WINDOW *window);
 
+/**
+ * Print information on the right side of
+ * the application besides the main logo.
+ *
+ * @param[in,out] window Window view
+ * @param[in] info Information
+ */
+void
+util_print_info(WINDOW *window,
+                const char *info);
+
 #endif /* UTIL_H_ */