From 0d0e77d6900e614acbe62e03fb9a459479d8fb4c Mon Sep 17 00:00:00 2001
From: 12aw <arnev@gmx.de>
Date: Fri, 19 Jan 2024 17:12:19 +0100
Subject: [PATCH] Revert "Change app ID and file path"

This reverts commit c805e130dc868813380d795162e6190a7c6e8a19.
---
 README.md                                        |  2 +-
 build.gradle                                     |  4 ++--
 git/release/output-metadata.json                 |  2 +-
 monocles_chat.doap                               |  2 +-
 playstore/release/output-metadata.json           |  2 +-
 proguard-rules.pro                               |  2 +-
 .../{eu => de}/monocles/chat/ui/StartUI.java     |  2 +-
 src/main/AndroidManifest.xml                     | 12 ++++++------
 .../{eu => de}/monocles/chat/BobTransfer.java    |  2 +-
 .../chat/ColorResourcesLoaderCreator.java        |  2 +-
 .../chat/ColorResourcesTableCreator.java         |  2 +-
 .../monocles/chat/ConnectionService.java         |  2 +-
 .../monocles/chat/ConversationPage.java          |  2 +-
 .../monocles/chat/DownloadDefaultStickers.java   |  2 +-
 .../{eu => de}/monocles/chat/EmojiSearch.java    |  2 +-
 .../monocles/chat/GetThumbnailForCid.java        |  2 +-
 .../java/{eu => de}/monocles/chat/GridView.java  |  2 +-
 .../monocles/chat/InlineImageSpan.java           |  2 +-
 .../monocles/chat/KeyboardHeightProvider.java    |  2 +-
 .../chat/MessageTextActionModeCallback.java      |  2 +-
 .../monocles/chat/ReadMoreListener.java          |  2 +-
 .../monocles/chat/ReadMoreTextView.java          |  2 +-
 .../monocles/chat/RegisterMonoclesActivity.java  |  2 +-
 .../{eu => de}/monocles/chat/SignUpPage.java     |  2 +-
 .../{eu => de}/monocles/chat/SpannedToXHTML.java |  2 +-
 .../{eu => de}/monocles/chat/SwipeDetector.java  |  2 +-
 .../{eu => de}/monocles/chat/TagEditorView.java  |  2 +-
 .../java/{eu => de}/monocles/chat/ThumbHash.java |  2 +-
 src/main/java/{eu => de}/monocles/chat/Util.java |  2 +-
 .../{eu => de}/monocles/chat/WebxdcPage.java     |  2 +-
 .../{eu => de}/monocles/chat/WebxdcUpdate.java   |  2 +-
 .../monocles/chat/ui/CallsActivity.java          |  2 +-
 .../monocles/chat/ui/PermissionsActivity.java    |  2 +-
 src/main/java/{eu => de}/monocles/chat/utils     |  2 +-
 .../eu/siacs/conversations/entities/Contact.java |  4 ++--
 .../conversations/entities/Conversation.java     |  6 +++---
 .../eu/siacs/conversations/entities/Message.java | 12 ++++++------
 .../conversations/generator/IqGenerator.java     |  2 +-
 .../conversations/parser/MessageParser.java      |  4 ++--
 .../persistance/DatabaseBackend.java             |  2 +-
 .../conversations/persistance/FileBackend.java   |  4 ++--
 .../services/NotificationService.java            |  2 +-
 .../conversations/services/UpdateService.java    |  2 +-
 .../services/XmppConnectionService.java          |  4 ++--
 .../conversations/ui/ContactDetailsActivity.java |  2 +-
 .../conversations/ui/ConversationFragment.java   |  8 ++++----
 .../conversations/ui/ConversationsActivity.java  |  6 +++---
 .../conversations/ui/MagicCreateActivity.java    |  2 +-
 .../siacs/conversations/ui/SettingsActivity.java |  4 ++--
 .../conversations/ui/ShowLocationActivity.java   |  2 +-
 .../ui/StartConversationActivity.java            |  2 +-
 .../conversations/ui/UriHandlerActivity.java     |  2 +-
 .../siacs/conversations/ui/WelcomeActivity.java  |  4 ++--
 .../eu/siacs/conversations/ui/XmppActivity.java  |  2 +-
 .../ui/adapter/ConversationAdapter.java          |  4 ++--
 .../conversations/ui/adapter/MessageAdapter.java | 12 ++++++------
 .../conversations/utils/FirstStartManager.java   |  2 +-
 .../siacs/conversations/utils/ThemeHelper.java   |  4 ++--
 .../res/layout-land/fragment_conversation.xml    |  2 +-
 src/main/res/layout/activity_contact_details.xml |  2 +-
 src/main/res/layout/activity_muc_details.xml     |  2 +-
 .../res/layout/activity_register_monocles.xml    |  2 +-
 .../res/layout/command_button_grid_field.xml     |  2 +-
 src/main/res/layout/command_radio_edit_field.xml |  2 +-
 src/main/res/layout/fragment_conversation.xml    |  2 +-
 src/main/res/layout/message_content.xml          |  2 +-
 src/main/res/xml/preferences.xml                 | 16 ++++++++--------
 .../java/{eu => de}/monocles/chat/StartUI.java   |  2 +-
 68 files changed, 106 insertions(+), 106 deletions(-)
 rename src/git/java/{eu => de}/monocles/chat/ui/StartUI.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/BobTransfer.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/ColorResourcesLoaderCreator.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/ColorResourcesTableCreator.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/ConnectionService.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/ConversationPage.java (92%)
 rename src/main/java/{eu => de}/monocles/chat/DownloadDefaultStickers.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/EmojiSearch.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/GetThumbnailForCid.java (85%)
 rename src/main/java/{eu => de}/monocles/chat/GridView.java (97%)
 rename src/main/java/{eu => de}/monocles/chat/InlineImageSpan.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/KeyboardHeightProvider.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/MessageTextActionModeCallback.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/ReadMoreListener.java (81%)
 rename src/main/java/{eu => de}/monocles/chat/ReadMoreTextView.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/RegisterMonoclesActivity.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/SignUpPage.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/SpannedToXHTML.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/SwipeDetector.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/TagEditorView.java (98%)
 rename src/main/java/{eu => de}/monocles/chat/ThumbHash.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/Util.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/WebxdcPage.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/WebxdcUpdate.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/ui/CallsActivity.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/ui/PermissionsActivity.java (99%)
 rename src/main/java/{eu => de}/monocles/chat/utils (92%)
 rename src/playstore/java/{eu => de}/monocles/chat/StartUI.java (98%)

diff --git a/README.md b/README.md
index 6f4515dfe..9a1ba1948 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ monocles chat ist moderner und sicherer Android XMPP-Client. Basierend auf blabb
 Vorschaubilder erstellt von Pigeonalley (https://pigeonalley.com)
 
 Download ist hier möglich:
-<a href="https://f-droid.org/app/eu.monocles.chat"><img src="https://f-droid.org/badge/get-it-on-de.png" alt="Jetzt bei F-Droid" height="100"></a>
+<a href="https://f-droid.org/app/de.monocles.chat"><img src="https://f-droid.org/badge/get-it-on-de.png" alt="Jetzt bei F-Droid" height="100"></a>
 
 Folge uns auf <a rel="me" href="https://monocles.social/@monocles">monocles social</a> 
 
diff --git a/build.gradle b/build.gradle
index 9711c25e6..c84092f83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ android {
 
         archivesBaseName += "-$versionName"
         // archivesBaseName += "$versionNameSuffix"  // activate for beta versions
-        applicationId "eu.monocles.chat"
+        applicationId "de.monocles.chat"
         multiDexEnabled true
         //versionName grgit.describe(always: true)
         buildConfigField("String", "LOGTAG", '"monocles chat"')
@@ -199,7 +199,7 @@ android {
         playstore {
             dimension "distribution"
             versionNameSuffix "-playstore"
-            applicationId "eu.monocles.chat"
+            applicationId "de.monocles.chat"
             buildConfigField("boolean", "SHOW_MIGRATION_INFO", 'false')
             resValue "string", "applicationId", applicationId
         }
diff --git a/git/release/output-metadata.json b/git/release/output-metadata.json
index 4cb30253f..24293d5d6 100644
--- a/git/release/output-metadata.json
+++ b/git/release/output-metadata.json
@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "eu.monocles.chat",
+  "applicationId": "de.monocles.chat",
   "variantName": "gitRelease",
   "elements": [
     {
diff --git a/monocles_chat.doap b/monocles_chat.doap
index 93b3ce08c..e1b7a3d31 100644
--- a/monocles_chat.doap
+++ b/monocles_chat.doap
@@ -14,7 +14,7 @@
     <description xml:lang="en">monocles chat is a modern and secure chat app using XMPP. Based on Conversations and Blabber.im but with many changes.</description>
 
     <homepage rdf:resource="https://monocles.eu/more/"/>
-    <download-page rdf:resource="https://f-droid.org/en/packages/eu.monocles.chat/"/>
+    <download-page rdf:resource="https://f-droid.org/en/packages/de.monocles.chat/"/>
     <bug-database rdf:resource="https://codeberg.org/Arne/monocles_chat/issues"/>
     <!-- See https://github.com/ewilderj/doap/issues/53 -->
     <developer-forum rdf:resource="xmpp:development@conference.monocles.de?join"/>
diff --git a/playstore/release/output-metadata.json b/playstore/release/output-metadata.json
index 6cceec6c6..99887c851 100644
--- a/playstore/release/output-metadata.json
+++ b/playstore/release/output-metadata.json
@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "eu.monocles.chat",
+  "applicationId": "de.monocles.chat",
   "variantName": "playstoreRelease",
   "elements": [
     {
diff --git a/proguard-rules.pro b/proguard-rules.pro
index e16be17f2..eb8c57688 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -1,6 +1,6 @@
 -dontobfuscate
 
--keep class eu.monocles.chat.**
+-keep class de.monocles.chat.**
 -keep class de.pixart.messenger.**
 -keep class eu.siacs.conversations.**
 
diff --git a/src/git/java/eu/monocles/chat/ui/StartUI.java b/src/git/java/de/monocles/chat/ui/StartUI.java
similarity index 98%
rename from src/git/java/eu/monocles/chat/ui/StartUI.java
rename to src/git/java/de/monocles/chat/ui/StartUI.java
index 22ec3ea68..b7686b1d0 100644
--- a/src/git/java/eu/monocles/chat/ui/StartUI.java
+++ b/src/git/java/de/monocles/chat/ui/StartUI.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat.ui;
+package de.monocles.chat.ui;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7e5014cce..cf3c614ba 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -133,10 +133,10 @@
         tools:targetApi="tiramisu">
 
         <service
-            android:name="eu.monocles.chat.DownloadDefaultStickers"
+            android:name="de.monocles.chat.DownloadDefaultStickers"
             android:foregroundServiceType="dataSync" />
 
-        <service android:name="eu.monocles.chat.ConnectionService"
+        <service android:name="de.monocles.chat.ConnectionService"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
             android:exported="true">
@@ -225,7 +225,7 @@
         <receiver android:name=".services.AlarmReceiver" />
 
         <activity
-            android:name="eu.monocles.chat.ui.StartUI"
+            android:name="de.monocles.chat.ui.StartUI"
             android:configChanges="orientation|screenSize"
             android:label="@string/short_app_name"
             android:launchMode="singleTask"
@@ -328,7 +328,7 @@
             android:label="@string/create_account"
             android:launchMode="singleTask" />
         <activity
-            android:name="eu.monocles.chat.SignUpPage"
+            android:name="de.monocles.chat.SignUpPage"
             android:label="@string/create_account"
             android:launchMode="singleTask"
             android:exported="true">
@@ -345,11 +345,11 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="eu.monocles.chat.RegisterMonoclesActivity"
+            android:name="de.monocles.chat.RegisterMonoclesActivity"
             android:label="@string/create_account"
             android:launchMode="singleTask" />
         <activity
-            android:name="eu.monocles.chat.ui.CallsActivity"
+            android:name="de.monocles.chat.ui.CallsActivity"
             android:label="@string/calls"
             android:launchMode="singleTask" />
         <activity
diff --git a/src/main/java/eu/monocles/chat/BobTransfer.java b/src/main/java/de/monocles/chat/BobTransfer.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/BobTransfer.java
rename to src/main/java/de/monocles/chat/BobTransfer.java
index 9e642001f..4d53a88bf 100644
--- a/src/main/java/eu/monocles/chat/BobTransfer.java
+++ b/src/main/java/de/monocles/chat/BobTransfer.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.net.Uri;
 import android.util.Base64;
diff --git a/src/main/java/eu/monocles/chat/ColorResourcesLoaderCreator.java b/src/main/java/de/monocles/chat/ColorResourcesLoaderCreator.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ColorResourcesLoaderCreator.java
rename to src/main/java/de/monocles/chat/ColorResourcesLoaderCreator.java
index aed15529f..b57804ebd 100644
--- a/src/main/java/eu/monocles/chat/ColorResourcesLoaderCreator.java
+++ b/src/main/java/de/monocles/chat/ColorResourcesLoaderCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.content.res.loader.ResourcesLoader;
diff --git a/src/main/java/eu/monocles/chat/ColorResourcesTableCreator.java b/src/main/java/de/monocles/chat/ColorResourcesTableCreator.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ColorResourcesTableCreator.java
rename to src/main/java/de/monocles/chat/ColorResourcesTableCreator.java
index c8c2dc9b7..fb33ce6ec 100644
--- a/src/main/java/eu/monocles/chat/ColorResourcesTableCreator.java
+++ b/src/main/java/de/monocles/chat/ColorResourcesTableCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.util.Pair;
diff --git a/src/main/java/eu/monocles/chat/ConnectionService.java b/src/main/java/de/monocles/chat/ConnectionService.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ConnectionService.java
rename to src/main/java/de/monocles/chat/ConnectionService.java
index 63f2674c4..169585f15 100644
--- a/src/main/java/eu/monocles/chat/ConnectionService.java
+++ b/src/main/java/de/monocles/chat/ConnectionService.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
diff --git a/src/main/java/eu/monocles/chat/ConversationPage.java b/src/main/java/de/monocles/chat/ConversationPage.java
similarity index 92%
rename from src/main/java/eu/monocles/chat/ConversationPage.java
rename to src/main/java/de/monocles/chat/ConversationPage.java
index f3066c513..aecccaa9d 100644
--- a/src/main/java/eu/monocles/chat/ConversationPage.java
+++ b/src/main/java/de/monocles/chat/ConversationPage.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/main/java/eu/monocles/chat/DownloadDefaultStickers.java b/src/main/java/de/monocles/chat/DownloadDefaultStickers.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/DownloadDefaultStickers.java
rename to src/main/java/de/monocles/chat/DownloadDefaultStickers.java
index 39aeb3b8f..ce17fbeb9 100644
--- a/src/main/java/eu/monocles/chat/DownloadDefaultStickers.java
+++ b/src/main/java/de/monocles/chat/DownloadDefaultStickers.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import static eu.siacs.conversations.persistance.FileBackend.APP_DIRECTORY;
 
diff --git a/src/main/java/eu/monocles/chat/EmojiSearch.java b/src/main/java/de/monocles/chat/EmojiSearch.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/EmojiSearch.java
rename to src/main/java/de/monocles/chat/EmojiSearch.java
index eed0d56e8..10c0ba6c3 100644
--- a/src/main/java/eu/monocles/chat/EmojiSearch.java
+++ b/src/main/java/de/monocles/chat/EmojiSearch.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/main/java/eu/monocles/chat/GetThumbnailForCid.java b/src/main/java/de/monocles/chat/GetThumbnailForCid.java
similarity index 85%
rename from src/main/java/eu/monocles/chat/GetThumbnailForCid.java
rename to src/main/java/de/monocles/chat/GetThumbnailForCid.java
index c4103a83e..e90f2e186 100644
--- a/src/main/java/eu/monocles/chat/GetThumbnailForCid.java
+++ b/src/main/java/de/monocles/chat/GetThumbnailForCid.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.graphics.drawable.Drawable;
 
diff --git a/src/main/java/eu/monocles/chat/GridView.java b/src/main/java/de/monocles/chat/GridView.java
similarity index 97%
rename from src/main/java/eu/monocles/chat/GridView.java
rename to src/main/java/de/monocles/chat/GridView.java
index 1e40a3732..4bd6745c5 100644
--- a/src/main/java/eu/monocles/chat/GridView.java
+++ b/src/main/java/de/monocles/chat/GridView.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/eu/monocles/chat/InlineImageSpan.java b/src/main/java/de/monocles/chat/InlineImageSpan.java
similarity index 98%
rename from src/main/java/eu/monocles/chat/InlineImageSpan.java
rename to src/main/java/de/monocles/chat/InlineImageSpan.java
index 203afd3d9..3a11010ba 100644
--- a/src/main/java/eu/monocles/chat/InlineImageSpan.java
+++ b/src/main/java/de/monocles/chat/InlineImageSpan.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.graphics.Paint;
 import android.graphics.drawable.AnimatedImageDrawable;
diff --git a/src/main/java/eu/monocles/chat/KeyboardHeightProvider.java b/src/main/java/de/monocles/chat/KeyboardHeightProvider.java
similarity index 98%
rename from src/main/java/eu/monocles/chat/KeyboardHeightProvider.java
rename to src/main/java/de/monocles/chat/KeyboardHeightProvider.java
index dc1875053..86887137c 100644
--- a/src/main/java/eu/monocles/chat/KeyboardHeightProvider.java
+++ b/src/main/java/de/monocles/chat/KeyboardHeightProvider.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/main/java/eu/monocles/chat/MessageTextActionModeCallback.java b/src/main/java/de/monocles/chat/MessageTextActionModeCallback.java
similarity index 98%
rename from src/main/java/eu/monocles/chat/MessageTextActionModeCallback.java
rename to src/main/java/de/monocles/chat/MessageTextActionModeCallback.java
index 13447e545..105154147 100644
--- a/src/main/java/eu/monocles/chat/MessageTextActionModeCallback.java
+++ b/src/main/java/de/monocles/chat/MessageTextActionModeCallback.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.view.ActionMode;
 import android.view.Menu;
diff --git a/src/main/java/eu/monocles/chat/ReadMoreListener.java b/src/main/java/de/monocles/chat/ReadMoreListener.java
similarity index 81%
rename from src/main/java/eu/monocles/chat/ReadMoreListener.java
rename to src/main/java/de/monocles/chat/ReadMoreListener.java
index c3e868d9d..1e459e3cc 100644
--- a/src/main/java/eu/monocles/chat/ReadMoreListener.java
+++ b/src/main/java/de/monocles/chat/ReadMoreListener.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 /**
  * Created by Mays Atari.
diff --git a/src/main/java/eu/monocles/chat/ReadMoreTextView.java b/src/main/java/de/monocles/chat/ReadMoreTextView.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ReadMoreTextView.java
rename to src/main/java/de/monocles/chat/ReadMoreTextView.java
index 6d3667ede..c88484c33 100644
--- a/src/main/java/eu/monocles/chat/ReadMoreTextView.java
+++ b/src/main/java/de/monocles/chat/ReadMoreTextView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/main/java/eu/monocles/chat/RegisterMonoclesActivity.java b/src/main/java/de/monocles/chat/RegisterMonoclesActivity.java
similarity index 98%
rename from src/main/java/eu/monocles/chat/RegisterMonoclesActivity.java
rename to src/main/java/de/monocles/chat/RegisterMonoclesActivity.java
index 7ef3b0cb1..6746969c7 100644
--- a/src/main/java/eu/monocles/chat/RegisterMonoclesActivity.java
+++ b/src/main/java/de/monocles/chat/RegisterMonoclesActivity.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/main/java/eu/monocles/chat/SignUpPage.java b/src/main/java/de/monocles/chat/SignUpPage.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/SignUpPage.java
rename to src/main/java/de/monocles/chat/SignUpPage.java
index 1d5f7a183..045272ca0 100644
--- a/src/main/java/eu/monocles/chat/SignUpPage.java
+++ b/src/main/java/de/monocles/chat/SignUpPage.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import static eu.siacs.conversations.ui.StartConversationActivity.addInviteUri;
 
diff --git a/src/main/java/eu/monocles/chat/SpannedToXHTML.java b/src/main/java/de/monocles/chat/SpannedToXHTML.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/SpannedToXHTML.java
rename to src/main/java/de/monocles/chat/SpannedToXHTML.java
index 0ef1bbb9b..f36af4cc5 100644
--- a/src/main/java/eu/monocles/chat/SpannedToXHTML.java
+++ b/src/main/java/de/monocles/chat/SpannedToXHTML.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.app.Application;
 import android.graphics.Typeface;
diff --git a/src/main/java/eu/monocles/chat/SwipeDetector.java b/src/main/java/de/monocles/chat/SwipeDetector.java
similarity index 98%
rename from src/main/java/eu/monocles/chat/SwipeDetector.java
rename to src/main/java/de/monocles/chat/SwipeDetector.java
index 79a9e80fb..3ca68094f 100644
--- a/src/main/java/eu/monocles/chat/SwipeDetector.java
+++ b/src/main/java/de/monocles/chat/SwipeDetector.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.util.Log;
 import android.view.MotionEvent;
diff --git a/src/main/java/eu/monocles/chat/TagEditorView.java b/src/main/java/de/monocles/chat/TagEditorView.java
similarity index 98%
rename from src/main/java/eu/monocles/chat/TagEditorView.java
rename to src/main/java/de/monocles/chat/TagEditorView.java
index 78cf02374..efb6e1e7e 100644
--- a/src/main/java/eu/monocles/chat/TagEditorView.java
+++ b/src/main/java/de/monocles/chat/TagEditorView.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/main/java/eu/monocles/chat/ThumbHash.java b/src/main/java/de/monocles/chat/ThumbHash.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ThumbHash.java
rename to src/main/java/de/monocles/chat/ThumbHash.java
index 10367a101..7a8e0ce30 100644
--- a/src/main/java/eu/monocles/chat/ThumbHash.java
+++ b/src/main/java/de/monocles/chat/ThumbHash.java
@@ -7,7 +7,7 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-package eu.monocles.chat;
+package de.monocles.chat;
 
 public final class ThumbHash {
     /**
diff --git a/src/main/java/eu/monocles/chat/Util.java b/src/main/java/de/monocles/chat/Util.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/Util.java
rename to src/main/java/de/monocles/chat/Util.java
index e4702bd1b..8d9dcd2d0 100644
--- a/src/main/java/eu/monocles/chat/Util.java
+++ b/src/main/java/de/monocles/chat/Util.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/main/java/eu/monocles/chat/WebxdcPage.java b/src/main/java/de/monocles/chat/WebxdcPage.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/WebxdcPage.java
rename to src/main/java/de/monocles/chat/WebxdcPage.java
index 3a95b5235..aa6451ee0 100644
--- a/src/main/java/eu/monocles/chat/WebxdcPage.java
+++ b/src/main/java/de/monocles/chat/WebxdcPage.java
@@ -1,7 +1,7 @@
 // Based on GPLv3 code from deltachat-android
 // https://github.com/deltachat/deltachat-android/blob/master/src/org/thoughtcrime/securesms/WebViewActivity.java
 // https://github.com/deltachat/deltachat-android/blob/master/src/org/thoughtcrime/securesms/WebxdcActivity.java
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/main/java/eu/monocles/chat/WebxdcUpdate.java b/src/main/java/de/monocles/chat/WebxdcUpdate.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/WebxdcUpdate.java
rename to src/main/java/de/monocles/chat/WebxdcUpdate.java
index 8ad44ab4b..8aaddba9f 100644
--- a/src/main/java/eu/monocles/chat/WebxdcUpdate.java
+++ b/src/main/java/de/monocles/chat/WebxdcUpdate.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat;
+package de.monocles.chat;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/src/main/java/eu/monocles/chat/ui/CallsActivity.java b/src/main/java/de/monocles/chat/ui/CallsActivity.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ui/CallsActivity.java
rename to src/main/java/de/monocles/chat/ui/CallsActivity.java
index a0ea6f428..10a1e0456 100644
--- a/src/main/java/eu/monocles/chat/ui/CallsActivity.java
+++ b/src/main/java/de/monocles/chat/ui/CallsActivity.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat.ui;
+package de.monocles.chat.ui;
 
 import android.content.DialogInterface;
 import android.content.Intent;
diff --git a/src/main/java/eu/monocles/chat/ui/PermissionsActivity.java b/src/main/java/de/monocles/chat/ui/PermissionsActivity.java
similarity index 99%
rename from src/main/java/eu/monocles/chat/ui/PermissionsActivity.java
rename to src/main/java/de/monocles/chat/ui/PermissionsActivity.java
index c2927f3b8..f7612db15 100644
--- a/src/main/java/eu/monocles/chat/ui/PermissionsActivity.java
+++ b/src/main/java/de/monocles/chat/ui/PermissionsActivity.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat.ui;
+package de.monocles.chat.ui;
 
 import android.Manifest;
 import android.content.Intent;
diff --git a/src/main/java/eu/monocles/chat/utils b/src/main/java/de/monocles/chat/utils
similarity index 92%
rename from src/main/java/eu/monocles/chat/utils
rename to src/main/java/de/monocles/chat/utils
index b66c9c066..780aed3ec 100644
--- a/src/main/java/eu/monocles/chat/utils
+++ b/src/main/java/de/monocles/chat/utils
@@ -1,4 +1,4 @@
-package eu.monocles.chat
+package de.monocles.chat
 
 import android.content.Context
 import androidx.annotation.AttrRes
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 5da6174f3..4ef1c0d54 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -747,8 +747,8 @@ public class Contact implements ListItem, Blockable {
 
     public PhoneAccountHandle phoneAccountHandle() {
         ComponentName componentName = new ComponentName(
-                "eu.monocles.chat",
-                "eu.monocles.chat.ConnectionService"
+                "de.monocles.chat",
+                "de.monocles.chat.ConnectionService"
         );
         return new PhoneAccountHandle(componentName, phoneAccountLabel());
     }
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 633590534..3f728ed6e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -64,9 +64,9 @@ import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.common.base.Optional;
 
-import eu.monocles.chat.ConversationPage;
-import eu.monocles.chat.Util;
-import eu.monocles.chat.WebxdcPage;
+import de.monocles.chat.ConversationPage;
+import de.monocles.chat.Util;
+import de.monocles.chat.WebxdcPage;
 
 import eu.siacs.conversations.xmpp.forms.Field;
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 3a9e295b6..a09355be4 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -21,10 +21,10 @@ import android.text.Html;
 import android.util.Pair;
 import android.view.View;
 
-import eu.monocles.chat.BobTransfer;
-import eu.monocles.chat.GetThumbnailForCid;
-import eu.monocles.chat.InlineImageSpan;
-import eu.monocles.chat.SpannedToXHTML;
+import de.monocles.chat.BobTransfer;
+import de.monocles.chat.GetThumbnailForCid;
+import de.monocles.chat.InlineImageSpan;
+import de.monocles.chat.SpannedToXHTML;
 
 import java.io.IOException;
 import java.util.stream.Collectors;
@@ -37,8 +37,8 @@ import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteSource;
 import com.google.common.primitives.Longs;
-import eu.monocles.chat.BobTransfer;
-import eu.monocles.chat.GetThumbnailForCid;
+import de.monocles.chat.BobTransfer;
+import de.monocles.chat.GetThumbnailForCid;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index 6505864fc..225fd2340 100644
--- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
@@ -9,7 +9,7 @@ import android.util.Log;
 import android.util.Base64OutputStream;
 import eu.siacs.conversations.entities.Message;
 
-import eu.monocles.chat.BobTransfer;
+import de.monocles.chat.BobTransfer;
 
 import com.google.common.io.ByteStreams;
 
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 6a364016e..3429ed431 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -6,8 +6,8 @@ import android.net.Uri;
 
 
 
-import eu.monocles.chat.BobTransfer;
-import eu.monocles.chat.WebxdcUpdate;
+import de.monocles.chat.BobTransfer;
+import de.monocles.chat.WebxdcUpdate;
 import java.io.File;
 
 import java.net.URISyntaxException;
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index 264f1c4aa..1987ee801 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -15,7 +15,7 @@ import android.util.Log;
 
 import com.google.common.base.Stopwatch;
 
-import eu.monocles.chat.WebxdcUpdate;
+import de.monocles.chat.WebxdcUpdate;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 2cba04031..78875e9fb 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -63,8 +63,8 @@ import com.google.common.io.ByteStreams;
 
 import com.wolt.blurhashkt.BlurHashDecoder;
 
-import eu.monocles.chat.BobTransfer;
-import eu.monocles.chat.ThumbHash;
+import de.monocles.chat.BobTransfer;
+import de.monocles.chat.ThumbHash;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index d48d114e4..d645a28bc 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.services;
 
-import static eu.monocles.chat.ui.PermissionsActivity.permissions;
+import static de.monocles.chat.ui.PermissionsActivity.permissions;
 import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube;
 import static eu.siacs.conversations.utils.Compatibility.s;
 
diff --git a/src/main/java/eu/siacs/conversations/services/UpdateService.java b/src/main/java/eu/siacs/conversations/services/UpdateService.java
index 9985f5024..24fd0e6a1 100644
--- a/src/main/java/eu/siacs/conversations/services/UpdateService.java
+++ b/src/main/java/eu/siacs/conversations/services/UpdateService.java
@@ -100,7 +100,7 @@ public class UpdateService extends AsyncTask<String, Object, UpdateService.Wrapp
                 String ownVersion = BuildConfig.VERSION_NAME;
                 String url = json.getString("appURI");
                 String filesize = json.getString("filesize");
-                if (BuildConfig.APPLICATION_ID.equals("eu.monocles.chat")) {
+                if (BuildConfig.APPLICATION_ID.equals("de.monocles.chat")) {
                     url = json.getString("appURIPS");
                     filesize = json.getString("filesizePS");
                 }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 53277c658..818b85623 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -100,8 +100,8 @@ import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.otaliastudios.transcoder.strategy.DefaultAudioStrategy;
 
-import eu.monocles.chat.EmojiSearch;
-import eu.monocles.chat.WebxdcUpdate;
+import de.monocles.chat.EmojiSearch;
+import de.monocles.chat.WebxdcUpdate;
 
 import org.conscrypt.Conscrypt;
 import org.openintents.openpgp.IOpenPgpService2;
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 09809f8de..98bd2efb4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -93,7 +93,7 @@ import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.ui.util.ShareUtil;
 import eu.siacs.conversations.databinding.CommandRowBinding;
-import eu.monocles.chat.Util;
+import de.monocles.chat.Util;
 import android.view.ViewGroup;
 import android.util.TypedValue;
 import android.graphics.drawable.Drawable;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index f8cbd6670..f80922ccf 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -8,8 +8,8 @@ import java.lang.ref.WeakReference;
 import java.util.Date;
 import java.util.Map;
 
-import eu.monocles.chat.KeyboardHeightProvider;
-import eu.monocles.chat.WebxdcPage;
+import de.monocles.chat.KeyboardHeightProvider;
+import de.monocles.chat.WebxdcPage;
 import eu.siacs.conversations.ui.adapter.CommandAdapter;
 import eu.siacs.conversations.utils.Random;
 import eu.siacs.conversations.xml.Element;
@@ -114,8 +114,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 import eu.siacs.conversations.utils.Emoticons;
-import eu.monocles.chat.BobTransfer;
-import eu.monocles.chat.EmojiSearch;
+import de.monocles.chat.BobTransfer;
+import de.monocles.chat.EmojiSearch;
 import java.net.URISyntaxException;
 import android.os.Environment;
 import android.os.storage.StorageManager;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index e307729df..0563d2c31 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -29,7 +29,7 @@
 
 package eu.siacs.conversations.ui;
 
-import static eu.monocles.chat.ui.PermissionsActivity.permissions;
+import static de.monocles.chat.ui.PermissionsActivity.permissions;
 import static eu.siacs.conversations.ui.ConversationFragment.REQUEST_DECRYPT_PGP;
 import static eu.siacs.conversations.ui.SettingsActivity.HIDE_MEMORY_WARNING;
 import static eu.siacs.conversations.ui.SettingsActivity.MIN_ANDROID_SDK21_SHOWN;
@@ -71,7 +71,7 @@ import android.widget.Toast;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import eu.monocles.chat.DownloadDefaultStickers;
+import de.monocles.chat.DownloadDefaultStickers;
 
 import net.java.otr4j.session.SessionStatus;
 import androidx.appcompat.widget.PopupMenu;
@@ -86,7 +86,7 @@ import androidx.databinding.DataBindingUtil;
 
 import org.openintents.openpgp.util.OpenPgpApi;
 
-import eu.monocles.chat.ui.CallsActivity;
+import de.monocles.chat.ui.CallsActivity;
 import eu.siacs.conversations.ui.util.AvatarWorkerTask;
 import eu.siacs.conversations.utils.Compatibility;
 import io.michaelrocks.libphonenumber.android.NumberParseException;
diff --git a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
index 82a13e4ae..884eed785 100644
--- a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import eu.monocles.chat.SignUpPage;
+import de.monocles.chat.SignUpPage;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityMagicCreateBinding;
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 5b116b413..ee603bfa5 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -36,7 +36,7 @@ import android.provider.OpenableColumns;
 import android.util.Log;
 import static eu.siacs.conversations.utils.CameraUtils.showCameraChooser;
 
-import eu.monocles.chat.DownloadDefaultStickers;
+import de.monocles.chat.DownloadDefaultStickers;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -45,7 +45,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.exifinterface.media.ExifInterface;
 
-import eu.monocles.chat.SignUpPage;
+import de.monocles.chat.SignUpPage;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.CameraUtils;
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
index 955262cb8..bd0d9e995 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
@@ -30,7 +30,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
 
-import eu.monocles.chat.SignUpPage;
+import de.monocles.chat.SignUpPage;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityShowLocationBinding;
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index b4c552d8c..c259abf91 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -53,7 +53,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import eu.monocles.chat.ui.CallsActivity;
+import de.monocles.chat.ui.CallsActivity;
 import eu.siacs.conversations.utils.UIHelper;
 
 import androidx.annotation.MenuRes;
diff --git a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
index 08ee2301c..6511bad18 100644
--- a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
@@ -19,7 +19,7 @@ import androidx.databinding.DataBindingUtil;
 
 import com.google.common.base.Strings;
 
-import eu.monocles.chat.DownloadDefaultStickers;
+import de.monocles.chat.DownloadDefaultStickers;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
index 43c7bd320..5c28c4c60 100644
--- a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.ui;
 
-import static eu.monocles.chat.ui.PermissionsActivity.permissions;
+import static de.monocles.chat.ui.PermissionsActivity.permissions;
 import static eu.siacs.conversations.Config.DISALLOW_REGISTRATION_IN_UI;
 import static eu.siacs.conversations.utils.PermissionUtils.allGranted;
 import static eu.siacs.conversations.utils.PermissionUtils.readGranted;
@@ -28,7 +28,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.HashSet;
 
-import eu.monocles.chat.RegisterMonoclesActivity;
+import de.monocles.chat.RegisterMonoclesActivity;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.WelcomeBinding;
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 9408e88ac..e40fce59e 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.ui;
 
-import static eu.monocles.chat.ui.PermissionsActivity.permissions;
+import static de.monocles.chat.ui.PermissionsActivity.permissions;
 import static eu.siacs.conversations.ui.SettingsActivity.USE_INTERNAL_UPDATER;
 
 import android.graphics.drawable.AnimatedImageDrawable;
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 69dcb0fa5..1e9518002 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -1,6 +1,6 @@
 package eu.siacs.conversations.ui.adapter;
 
-import static eu.monocles.chat.Util.getReadmakerType;
+import static de.monocles.chat.Util.getReadmakerType;
 import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube;
 
 import android.content.SharedPreferences;
@@ -25,7 +25,7 @@ import com.google.common.base.Strings;
 
 import java.util.List;
 
-import eu.monocles.chat.Util;
+import de.monocles.chat.Util;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ConversationListRowBinding;
 import eu.siacs.conversations.entities.Conversation;
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index a576d34b6..1b9cd13b0 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1,8 +1,8 @@
 package eu.siacs.conversations.ui.adapter;
 
-import eu.monocles.chat.BobTransfer;
-import eu.monocles.chat.MessageTextActionModeCallback;
-import eu.monocles.chat.Util;
+import de.monocles.chat.BobTransfer;
+import de.monocles.chat.MessageTextActionModeCallback;
+import de.monocles.chat.Util;
 import eu.siacs.conversations.ui.widget.ClickableMovementMethod;
 import eu.siacs.conversations.utils.Compatibility;
 import eu.siacs.conversations.xml.Element;
@@ -11,7 +11,7 @@ import me.saket.bettermovementmethod.BetterLinkMovementMethod;
 
 import static android.view.View.GONE;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-import static eu.monocles.chat.Util.getReadmakerType;
+import static de.monocles.chat.Util.getReadmakerType;
 import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY;
 import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY_OLD;
 import static eu.siacs.conversations.persistance.FileBackend.formatTime;
@@ -95,8 +95,8 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;
 
-import eu.monocles.chat.WebxdcUpdate;
-import eu.monocles.chat.WebxdcPage;
+import de.monocles.chat.WebxdcUpdate;
+import de.monocles.chat.WebxdcPage;
 
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.Config;
diff --git a/src/main/java/eu/siacs/conversations/utils/FirstStartManager.java b/src/main/java/eu/siacs/conversations/utils/FirstStartManager.java
index 845ae3c59..39bfe80c2 100644
--- a/src/main/java/eu/siacs/conversations/utils/FirstStartManager.java
+++ b/src/main/java/eu/siacs/conversations/utils/FirstStartManager.java
@@ -9,7 +9,7 @@ public class FirstStartManager {
     Context context;
     private SharedPreferences pref;
     private SharedPreferences.Editor editor;
-    private static final String PREF_NAME = "eu.monocles.chat";
+    private static final String PREF_NAME = "de.monocles.chat";
     private static final String IS_FIRST_TIME_LAUNCH = "IsFirstTimeLaunch";
 
     public FirstStartManager(Context context) {
diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
index 0d5924689..fe0471024 100644
--- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
@@ -40,7 +40,7 @@ import android.preference.PreferenceManager;
 import android.util.TypedValue;
 import android.widget.TextView;
 import android.content.res.loader.ResourcesLoader;
-import eu.monocles.chat.ColorResourcesLoaderCreator;
+import de.monocles.chat.ColorResourcesLoaderCreator;
 import java.util.HashMap;
 import android.util.Log;
 
@@ -66,7 +66,7 @@ public class ThemeHelper {
         if (sharedPreferences.contains("custom_theme_accent")) colors.put(R.color.custom_theme_accent, sharedPreferences.getInt("custom_theme_accent", 0));
         if (colors.isEmpty()) return colors;
 
-        ResourcesLoader loader = eu.monocles.chat.ColorResourcesLoaderCreator.create(context, colors);
+        ResourcesLoader loader = de.monocles.chat.ColorResourcesLoaderCreator.create(context, colors);
         try {
             if (loader != null) context.getResources().addLoaders(loader);
         } catch (final IllegalArgumentException e) {
diff --git a/src/main/res/layout-land/fragment_conversation.xml b/src/main/res/layout-land/fragment_conversation.xml
index 38526172d..7bed20791 100644
--- a/src/main/res/layout-land/fragment_conversation.xml
+++ b/src/main/res/layout-land/fragment_conversation.xml
@@ -187,7 +187,7 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:layout_gravity="center_vertical" />
 
-                        <eu.monocles.chat.ReadMoreTextView
+                        <de.monocles.chat.ReadMoreTextView
                             app:trimExpandedText="@string/show_less"
                             app:trimCollapsedText="@string/show_more"
                             app:trimMode="trimModeLength"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 36aee448a..778a48b06 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -107,7 +107,7 @@
                                         android:layout_gravity="center_horizontal"
                                         android:orientation="horizontal" />
 
-                                    <eu.monocles.chat.TagEditorView
+                                    <de.monocles.chat.TagEditorView
                                         android:id="@+id/edit_tags"
                                         android:visibility="gone"
                                         android:hint="@string/tags"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index ed57cec47..f5235f9b0 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -116,7 +116,7 @@
                             android:orientation="vertical"
                             android:visibility="gone">
 
-                            <eu.monocles.chat.TagEditorView
+                            <de.monocles.chat.TagEditorView
                                 android:id="@+id/edit_tags"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_register_monocles.xml b/src/main/res/layout/activity_register_monocles.xml
index cdf9b7e74..c7caa3028 100644
--- a/src/main/res/layout/activity_register_monocles.xml
+++ b/src/main/res/layout/activity_register_monocles.xml
@@ -52,7 +52,7 @@
                         android:text="@string/monocles_account_introduction"
                         android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
 
-                    <eu.monocles.chat.ReadMoreTextView
+                    <de.monocles.chat.ReadMoreTextView
                         android:id="@+id/instructions_monocles_account"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/command_button_grid_field.xml b/src/main/res/layout/command_button_grid_field.xml
index 1382823ee..dca9b81ef 100644
--- a/src/main/res/layout/command_button_grid_field.xml
+++ b/src/main/res/layout/command_button_grid_field.xml
@@ -40,7 +40,7 @@
             android:textAllCaps="false"
             android:minHeight="75dp" />
 
-        <eu.monocles.chat.GridView
+        <de.monocles.chat.GridView
             android:id="@+id/buttons"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/command_radio_edit_field.xml b/src/main/res/layout/command_radio_edit_field.xml
index af0ff4635..99975efe0 100644
--- a/src/main/res/layout/command_radio_edit_field.xml
+++ b/src/main/res/layout/command_radio_edit_field.xml
@@ -17,7 +17,7 @@
             android:textAppearance="@style/TextAppearance.Conversations.Subhead"
             android:textColor="?attr/edit_text_color" />
 
-        <eu.monocles.chat.GridView
+        <de.monocles.chat.GridView
             android:id="@+id/radios"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d58a8e7f3..a9ea1fe79 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -188,7 +188,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:layout_gravity="center_vertical" />
 
-            <eu.monocles.chat.ReadMoreTextView
+            <de.monocles.chat.ReadMoreTextView
                 app:trimExpandedText="@string/show_less"
                 app:trimCollapsedText="@string/show_more"
                 app:trimMode="trimModeLength"
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 4b5c63fe8..b1249f0a1 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -11,7 +11,7 @@
         android:textIsSelectable="true"
         android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
-    <eu.monocles.chat.ReadMoreTextView
+    <de.monocles.chat.ReadMoreTextView
         app:trimExpandedText="@string/show_less"
         app:trimCollapsedText="@string/show_more"
         app:trimMode="trimModeLength"
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 659226fd7..61a59e4df 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -9,7 +9,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-            android:targetPackage="eu.monocles.chat">
+            android:targetPackage="de.monocles.chat">
             <extra
                 android:name="page"
                 android:value="userinterface" />
@@ -67,7 +67,7 @@
                     <intent
                         android:action="android.intent.action.VIEW"
                         android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-                        android:targetPackage="eu.monocles.chat">
+                        android:targetPackage="de.monocles.chat">
                         <extra
                             android:name="page"
                             android:value="custom_theme" />
@@ -230,7 +230,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-            android:targetPackage="eu.monocles.chat">
+            android:targetPackage="de.monocles.chat">
             <extra
                 android:name="page"
                 android:value="notifications" />
@@ -247,7 +247,7 @@
             <intent
                 android:action="android.intent.action.VIEW"
                 android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-                android:targetPackage="eu.monocles.chat">
+                android:targetPackage="de.monocles.chat">
                 <extra
                     android:name="page"
                     android:value="quiet_hours" />
@@ -324,7 +324,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-            android:targetPackage="eu.monocles.chat">
+            android:targetPackage="de.monocles.chat">
             <extra
                 android:name="page"
                 android:value="attachments" />
@@ -405,7 +405,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-            android:targetPackage="eu.monocles.chat">
+            android:targetPackage="de.monocles.chat">
             <extra
                 android:name="page"
                 android:value="presence" />
@@ -442,7 +442,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-            android:targetPackage="eu.monocles.chat">
+            android:targetPackage="de.monocles.chat">
             <extra
                 android:name="page"
                 android:value="security" />
@@ -590,7 +590,7 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
-            android:targetPackage="eu.monocles.chat">
+            android:targetPackage="de.monocles.chat">
             <extra
                 android:name="page"
                 android:value="expert" />
diff --git a/src/playstore/java/eu/monocles/chat/StartUI.java b/src/playstore/java/de/monocles/chat/StartUI.java
similarity index 98%
rename from src/playstore/java/eu/monocles/chat/StartUI.java
rename to src/playstore/java/de/monocles/chat/StartUI.java
index 2f94f7299..669bd9c6a 100644
--- a/src/playstore/java/eu/monocles/chat/StartUI.java
+++ b/src/playstore/java/de/monocles/chat/StartUI.java
@@ -1,4 +1,4 @@
-package eu.monocles.chat.ui;
+package de.monocles.chat.ui;
 
 import android.content.Context;
 import android.content.Intent;