diff --git a/Dockerfile b/Dockerfile
index 627b12a..f9b63df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment settings
-ENV NEXTCLOUD_PATH="/config/www/nextcloud"
+ENV NEXTCLOUD_PATH="/config/www/nextcloud" \
+  LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 
 RUN \
  echo "**** install build packages ****" && \
@@ -27,6 +28,7 @@ RUN \
  apk add --no-cache --upgrade \
 	curl \
 	ffmpeg \
+	gnu-libiconv \
 	imagemagick \
 	libxml2 \
 	php7-apcu \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index dbaf9da..c072399 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment settings
-ENV NEXTCLOUD_PATH="/config/www/nextcloud"
+ENV NEXTCLOUD_PATH="/config/www/nextcloud" \
+  LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 
 RUN \
  echo "**** install build packages ****" && \
@@ -27,6 +28,7 @@ RUN \
  apk add --no-cache --upgrade \
 	curl \
 	ffmpeg \
+	gnu-libiconv \
 	imagemagick \
 	libxml2 \
 	php7-apcu \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index bf6f6eb..aa6baf8 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment settings
-ENV NEXTCLOUD_PATH="/config/www/nextcloud"
+ENV NEXTCLOUD_PATH="/config/www/nextcloud" \
+  LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
 
 RUN \
  echo "**** install build packages ****" && \
@@ -27,6 +28,7 @@ RUN \
  apk add --no-cache --upgrade \
 	curl \
 	ffmpeg \
+	gnu-libiconv \
 	imagemagick \
 	libxml2 \
 	php7-apcu \
diff --git a/README.md b/README.md
index fd20ab5..7fd7233 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ Then restart the container to replace it with the latest one.
 
 ### Collaborative Editing
 
-Nextcloud's built-in collaborative editing packages (Collabora and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons.
+Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons.
 
 If (auto) installed, those built-in packages may cause instability and should be removed.
 
@@ -246,6 +246,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **21.01.21:** - Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup.
 * **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **16.01.21:** - Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13).
 * **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container).
diff --git a/readme-vars.yml b/readme-vars.yml
index 46635a6..5c8c188 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -68,13 +68,14 @@ app_setup_block: |
 
   ### Collaborative Editing
 
-  Nextcloud's built-in collaborative editing packages (Collabora and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons.
+  Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons.
 
   If (auto) installed, those built-in packages may cause instability and should be removed.
   
 
 # changelog
 changelogs:
+  - { date: "21.01.21:", desc: "Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup." }
   - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
   - { date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)." }
   - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
diff --git a/root/etc/cont-init.d/70-aliases b/root/etc/cont-init.d/70-aliases
index 5dd66a5..32f80aa 100644
--- a/root/etc/cont-init.d/70-aliases
+++ b/root/etc/cont-init.d/70-aliases
@@ -13,3 +13,8 @@
 
 [[ ! -x /usr/bin/updater.phar ]] && \
   chmod +x /usr/bin/updater.phar
+
+if occ app:list | grep -q richdocumentscode; then
+  echo "Removing CODE Server"
+  occ app:remove richdocumentscode
+fi