diff --git a/signatur/lang/C/messages.po b/signatur/lang/C/messages.po
new file mode 100644
index 0000000..39113dc
--- /dev/null
+++ b/signatur/lang/C/messages.po
@@ -0,0 +1,46 @@
+# ADDON signatur
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica signatur addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-12-16 11:08+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: signatur.php:114
+msgid "BETA Version - Add a signature to your posts. This addon automatically appends a customizable signature to posts in Friendica. Users can enable or disable it, define personal signatures, and optionally include them in comments."
+msgstr ""
+
+#: signatur.php:115
+msgid "Enable Signature"
+msgstr ""
+
+#: signatur.php:116
+msgid "Your Signature"
+msgstr ""
+
+#: signatur.php:116
+msgid "Enter your custom signature. (Multiline allowed)"
+msgstr ""
+
+#: signatur.php:117
+msgid "Enable Signature in Comments"
+msgstr ""
+
+#: signatur.php:118
+msgid "Save"
+msgstr ""
+
+#: signatur.php:123
+msgid "Signature Settings"
+msgstr ""
diff --git a/signatur/signatur.php b/signatur/signatur.php
new file mode 100644
index 0000000..ce1a3af
--- /dev/null
+++ b/signatur/signatur.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Name: signatur
+ * Description: Automatically adds a signature to new posts. Admins can define a default signature, and users can configure their own.
+ * Version: 1.6
+ * Author: Matthias Ebers <https://loma.ml/profile/feb>
+ * Status: Beta
+ */
+
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+
+const SIGNATURE_MARKER = "[hr]";
+
+function signatur_install()
+{
+    Hook::register('post_local', __FILE__, 'signatur_add_signature');
+    Hook::register('addon_settings', __FILE__, 'signatur_user_settings');
+    Hook::register('addon_settings_post', __FILE__, 'signatur_user_settings_post');
+}
+
+/**
+ * Adds a signature to new posts.
+ *
+ * @param array &$b Post data.
+ */
+function signatur_add_signature(array &$b)
+{
+    if (empty($b['uid'])) {
+        return;
+    }
+
+    $enabled = DI::pConfig()->get($b['uid'], 'signatur', 'enabled', false);
+    if (!$enabled) {
+        return;
+    }
+
+    $isComment = !empty($b['parent']) && ($b['parent'] != ($b['uri-id'] ?? null));
+    $enableSignatureInComments = DI::pConfig()->get($b['uid'], 'signatur', 'enable_signature_in_comments', true);
+
+    if ($isComment && !$enableSignatureInComments) {
+        return;
+    }
+
+    $signature = DI::pConfig()->get($b['uid'], 'signatur', 'text', '');
+
+    if (strpos($b['body'], SIGNATURE_MARKER) !== false) {
+        return;
+    }
+
+    if (!empty($b['body'])) {
+        $b['body'] = insert_signature_before_images($b['body'], SIGNATURE_MARKER, $signature);
+    }
+}
+
+/**
+ * Inserts the signature based on the content structure.
+ *
+ * @param string $body The post body.
+ * @param string $signature_marker The signature marker.
+ * @param string $signature The signature text.
+ * @return string The modified post body.
+ */
+function insert_signature_before_images($body, $signature_marker, $signature)
+{
+    $lines = explode("\n", $body);
+    $image_count = 0;
+    $text_end_index = -1;
+
+    foreach ($lines as $index => $line) {
+        if (strpos($line, '[url=') !== false) {
+            $image_count++;
+            if ($image_count === 1 && $text_end_index === -1) {
+                $text_end_index = $index;
+            }
+        }
+    }
+
+    if ($image_count <= 1) {
+        return $body . "\n\n{$signature_marker}\n{$signature}";
+    }
+
+    if ($image_count >= 2 && $text_end_index !== -1) {
+        $lines_before_first_image = array_slice($lines, 0, $text_end_index);
+        $lines_after_first_image = array_slice($lines, $text_end_index);
+
+        return implode("\n", $lines_before_first_image) .
+            "\n\n{$signature_marker}\n{$signature}\n\n" .
+            implode("\n", $lines_after_first_image);
+    }
+
+    return $body . "\n\n{$signature_marker}\n{$signature}";
+}
+
+/**
+ * User settings for the app.
+ *
+ * @param array &$data Settings data for rendering.
+ */
+function signatur_user_settings(array &$data)
+{
+    $uid = DI::userSession()->getLocalUserId();
+    if (!$uid) {
+        return;
+    }
+
+    $enabled = DI::pConfig()->get($uid, 'signatur', 'enabled', false);
+    $signature = DI::pConfig()->get($uid, 'signatur', 'text', '');
+    $enable_signature_in_comments = DI::pConfig()->get($uid, 'signatur', 'enable_signature_in_comments', true);
+
+    $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/signatur/');
+    $html = Renderer::replaceMacros($t, [
+        '$description' => DI::l10n()->t('BETA Version - Add a signature to your posts. This addon automatically appends a customizable signature to posts in Friendica. Users can enable or disable it, define personal signatures, and optionally include them in comments.'),
+        '$enabled' => ['enabled', DI::l10n()->t('Enable Signature'), $enabled],
+        '$signature' => ['text', DI::l10n()->t('Your Signature'), $signature, DI::l10n()->t('Enter your custom signature. (Multiline allowed)')],
+        '$enable_signature_in_comments' => ['enable_signature_in_comments', DI::l10n()->t('Enable Signature in Comments'), $enable_signature_in_comments],
+        '$submit' => DI::l10n()->t('Save'),
+    ]);
+
+    $data = [
+        'addon' => 'signatur',
+        'title' => DI::l10n()->t('Signature Settings'),
+        'html' => $html,
+    ];
+}
+
+/**
+ * Saves user settings.
+ *
+ * @param array &$b Submitted data.
+ */
+function signatur_user_settings_post(array &$b)
+{
+    $uid = DI::userSession()->getLocalUserId();
+    if (!$uid || empty($_POST['signatur-submit'])) {
+        return;
+    }
+
+    $enabled = !empty($_POST['enabled']);
+    $signature = trim($_POST['text']);
+    $enable_signature_in_comments = !empty($_POST['enable_signature_in_comments']);
+
+    DI::pConfig()->set($uid, 'signatur', 'enabled', $enabled);
+    DI::pConfig()->set($uid, 'signatur', 'text', $signature);
+    DI::pConfig()->set($uid, 'signatur', 'enable_signature_in_comments', $enable_signature_in_comments);
+}
diff --git a/signatur/templates/admin.tpl b/signatur/templates/admin.tpl
new file mode 100644
index 0000000..16c906e
--- /dev/null
+++ b/signatur/templates/admin.tpl
@@ -0,0 +1,6 @@
+<p>{{$description}}</p>
+{{include file="field_textarea.tpl" field=$default_text}}
+
+
+
+
diff --git a/signatur/templates/settings.tpl b/signatur/templates/settings.tpl
new file mode 100644
index 0000000..8775093
--- /dev/null
+++ b/signatur/templates/settings.tpl
@@ -0,0 +1,4 @@
+<p>{{$description}}</p>
+{{include file="field_checkbox.tpl" field=$enabled}}
+{{include file="field_textarea.tpl" field=$signature}}
+{{include file="field_checkbox.tpl" field=$enable_signature_in_comments}}