diff --git a/thunderbird.be0 b/thunderbird.be0
index dc9861852..859a1aec9 100755
--- a/thunderbird.be0
+++ b/thunderbird.be0
@@ -2,7 +2,7 @@
 
 #export BEE_TMP_TMPDIR=/dev/shm BEE_TMP_BUILDROOT=/dev/shm/bee-root BEE_MAKEFLAGS='-j80'
 
-# BEE_VERSION thunderbird-60.8.0-0
+# BEE_VERSION thunderbird-60.8.0-1
 
 SRCURL[0]="https://ftp.mozilla.org/pub/thunderbird/releases/${PKGVERSION}/source/thunderbird-${PKGVERSION}.source.tar.xz"
 
@@ -41,9 +41,9 @@ mee_build () {
 
 mee_build_post() {
 
-    # create menu entry
+  # create menu entry
 
-    cat >${B}/thunderbird.desktop <<-EOF
+  cat >${B}/thunderbird.desktop <<-EOF
 	[Desktop Entry]
 	Version=1.0
 	Name=Thunderbird Mail
@@ -56,11 +56,11 @@ mee_build_post() {
 	Type=Application
 	MimeType=message/rfc822;x-scheme-handler/mailto;
 	StartupNotify=true
-	Categories=Network;Email;
+	Categories=Office;Network;
 	EOF
 
-   # create molgen ldap address book..
-   cat >${B}/all-molgen-ldap.js <<-EOF
+  # create molgen ldap address book..
+  cat >${B}/all-molgen-ldap.js <<EOF1
 	pref("ldap_2.autoComplete.directoryServer", "ldap_2.servers.MOLGEN_pre");
 	pref("ldap_2.autoComplete.useDirectory", true);
 	pref("ldap_2.servers.MOLGEN_pre.auth.dn", "");
@@ -70,8 +70,13 @@ mee_build_post() {
 	pref("ldap_2.servers.MOLGEN_pre.maxHits", 100);
 	pref("ldap_2.servers.MOLGEN_pre.uri", "ldap://ldap.molgen.mpg.de/dc=addressbook,dc=apps,dc=molgen,dc=mpg,dc=DE??sub?(objectclass=*)");
 	pref("ldap_2.servers.MOLGEN_pre.autoComplete.filterTemplate", "(|(mail=*%v*)(displayName=*%v*)(givenName=*%v*)(sn=*%v*)(cn=*%v*))");
-	pref("storage.nfs_filesystem", true);
-	EOF
+EOF1
+
+  # create molgen default prefs
+  cat >${B}/molgen-default-prefs.js <<EOF2
+  pref("storage.nfs_filesystem", true);
+  pref("nglayout.enable_drag_images", false);
+EOF2
 }
 
 mee_install() {
@@ -79,29 +84,28 @@ mee_install() {
 }
 
 mee_install_post() {
-    start_cmd install -d ${D}${LIBDIR}/mariux64
-    start_cmd rm ${D}${BINDIR}/${PKGNAME}
+  start_cmd install -d ${D}${LIBDIR}/mariux64
+  start_cmd rm ${D}${BINDIR}/${PKGNAME}
 
-    cat >${D}${LIBDIR}/mariux64/${PKGNAME}<<-EOF
+  cat >${D}${LIBDIR}/mariux64/${PKGNAME}<<EOF3
 	NSS_SDB_USE_CACHE=1 exec "${LIBDIR}/${PKGNAME}/${PKGNAME}" "\$@"
-	EOF
-    chmod 755 ${D}${LIBDIR}/mariux64/${PKGNAME}
-
-    # install official icon in all sizes
+EOF3
+  start_cmd chmod 755 ${D}${LIBDIR}/mariux64/${PKGNAME}
 
-    for size in 16 22 24 32 48 256 ; do
-        destdir=${D}${DATADIR}/hicolor/${size}x${size}/apps
+  # install official icon in all sizes
 
-        start_cmd mkdir -p ${destdir}
-        start_cmd ln -s ${LIBDIR}/thunderbird/chrome/icons/default/default${size}.png ${destdir}/thunderbird.png
-    done
+  for size in 16 22 24 32 48 256 ; do
+      destdir=${D}${DATADIR}/hicolor/${size}x${size}/apps
+      start_cmd mkdir -p ${destdir}
+      start_cmd ln -s ${LIBDIR}/thunderbird/chrome/icons/default/default${size}.png ${destdir}/thunderbird.png
+  done
 
-    # install menu-entry
+  # install menu-entry
 
-    start_cmd mkdir -p ${D}${DATADIR}/applications
-    start_cmd desktop-file-install --dir ${D}${DATADIR}/applications ${B}/thunderbird.desktop
+  start_cmd mkdir -p ${D}${DATADIR}/applications
+  start_cmd desktop-file-install --dir ${D}${DATADIR}/applications ${B}/thunderbird.desktop
 
-    # install ldap addressbook
-    start_cmd mkdir -p ${D}${LIBDIR}/thunderbird-${PKGVERSION}/defaults/pref
-    start_cmd install -m 0644 ${B}/all-molgen-ldap.js ${D}${LIBDIR}/thunderbird-${PKGVERSION}/defaults/pref
+  # install ldap addressbook
+  start_cmd install -m 0644 ${B}/all-molgen-ldap.js ${D}${LIBDIR}/thunderbird/defaults/pref
+  start_cmd install -m 0644 ${B}/molgen-default-prefs.js ${D}${LIBDIR}/thunderbird/defaults/pref
 }