diff --git a/Makefile.am b/Makefile.am
index dfefb3c..5a780d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,10 +40,11 @@ dist_doc_DATA        = README.org README.txt LICENSES.org CONTRIBUTING.org \
 
 confdir              = $(sysconfdir)/$(PACKAGE)
 
-dist_conf_DATA       = etc/init.lisp etc/next-previous-open.lisp \
-                    etc/default-theme.conf etc/shared.conf
+dist_conf_DATA       = etc/init.lisp etc/default-theme.conf etc/shared.conf
 
-dist_pkgdata_DATA    = modules/welcome-bot.lisp
+dist_pkgdata_DATA    = scripts/welcome-bot.lisp \
+                       modules/next-previous-open.lisp \
+                       modules/share-gemini-link.lisp
 
 dist_man1_MANS       = doc/tinmop.man
 
@@ -57,7 +58,7 @@ $(CONF_PATH_FILE):
 	grep "^;" $(CONF_PATH_FILE_IN)                          >  $(CONF_PATH_FILE)
 	echo -e "(in-package :config)\n"                        >> $(CONF_PATH_FILE);
 	echo "(alexandria:define-constant +sys-data-dir+"       >> $(CONF_PATH_FILE);
-	echo -e "\""$(pkgdatadir)"/data/\" :test #'string=)\n"  >> $(CONF_PATH_FILE);
+	echo -e "\"$(pkgdatadir)\" :test #'string=)\n"  >> $(CONF_PATH_FILE);
 
 	echo "(alexandria:define-constant +sys-conf-dir+"       >> $(CONF_PATH_FILE);
 	echo -e  "\"$(confdir)\" :test #'string=)\n"            >> $(CONF_PATH_FILE);
diff --git a/Makefile.in b/Makefile.in
index ebe7686..217403a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -397,10 +397,11 @@ dist_doc_DATA = README.org README.txt LICENSES.org CONTRIBUTING.org \
                     doc/man.org doc/send-toot.lisp NEWS.org ChangeLog
 
 confdir = $(sysconfdir)/$(PACKAGE)
-dist_conf_DATA = etc/init.lisp etc/next-previous-open.lisp \
-                    etc/default-theme.conf etc/shared.conf
+dist_conf_DATA = etc/init.lisp etc/default-theme.conf etc/shared.conf
+dist_pkgdata_DATA = scripts/welcome-bot.lisp \
+                       modules/next-previous-open.lisp \
+                       modules/share-gemini-link.lisp
 
-dist_pkgdata_DATA = modules/welcome-bot.lisp
 dist_man1_MANS = doc/tinmop.man
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1041,7 +1042,7 @@ $(CONF_PATH_FILE):
 	grep "^;" $(CONF_PATH_FILE_IN)                          >  $(CONF_PATH_FILE)
 	echo -e "(in-package :config)\n"                        >> $(CONF_PATH_FILE);
 	echo "(alexandria:define-constant +sys-data-dir+"       >> $(CONF_PATH_FILE);
-	echo -e "\""$(pkgdatadir)"/data/\" :test #'string=)\n"  >> $(CONF_PATH_FILE);
+	echo -e "\"$(pkgdatadir)\" :test #'string=)\n"  >> $(CONF_PATH_FILE);
 
 	echo "(alexandria:define-constant +sys-conf-dir+"       >> $(CONF_PATH_FILE);
 	echo -e  "\"$(confdir)\" :test #'string=)\n"            >> $(CONF_PATH_FILE);
diff --git a/etc/next-previous-open.lisp b/modules/next-previous-open.lisp
similarity index 100%
rename from etc/next-previous-open.lisp
rename to modules/next-previous-open.lisp
diff --git a/src/ui-goodies.lisp b/src/ui-goodies.lisp
index 644fbe3..01c6b53 100644
--- a/src/ui-goodies.lisp
+++ b/src/ui-goodies.lisp
@@ -993,7 +993,7 @@ Force the checking for new message in the thread the selected message belong."
                                 :if-exists    :append)
                  (write-sequence signature stream))))
            (insert-header-text (file)
-             (when (string-not-empty-p file)
+             (when (string-not-empty-p message-header-text)
                (with-open-file (stream file
                                        :if-exists    :append
                                        :direction    :output