diff --git a/dont-fixup.diff b/dont-fixup.diff
new file mode 100644
index 0000000..11d2b2d
--- /dev/null
+++ b/dont-fixup.diff
@@ -0,0 +1,20 @@
+References: https://github.com/kisli/vmime/issues/149
+
+libkcinetmapi does a much better fixup on its own.
+---
+ src/vmime/text.cpp |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: vmime-0.9.2.g500/src/vmime/text.cpp
+===================================================================
+--- vmime-0.9.2.g500.orig/src/vmime/text.cpp
++++ vmime-0.9.2.g500/src/vmime/text.cpp
+@@ -401,8 +401,6 @@ text* text::decodeAndUnfold(const parsin
+ 	out->removeAllWords();
+ 
+ 	std::vector <shared_ptr <word> > words = word::parseMultiple(ctx, in, 0, in.length(), NULL);
+-	fixBrokenWords(words);
+-
+ 	copy_vector(words, out->m_words);
+ 
+ 	return (out);
diff --git a/libvmime.changes b/libvmime.changes
index 7ae21fb..50f1fb4 100644
--- a/libvmime.changes
+++ b/libvmime.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Oct 30 18:36:29 UTC 2016 - jengelh@inai.de
+
+- Add dont-fixup.diff
+
 -------------------------------------------------------------------
 Wed Jun 22 17:05:17 UTC 2016 - jengelh@inai.de
 
diff --git a/libvmime.spec b/libvmime.spec
index 70cea46..3e489ec 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -31,6 +31,7 @@ Url:            http://vmime.org/
 Source:         vmime-%version.tar.xz
 Patch1:         libvmime-nodatetime.diff
 Patch2:         libvmime-sotag.diff
+Patch3:         dont-fixup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 %if 0%{?suse_version} < 1310
@@ -100,7 +101,7 @@ complete mail client.
 
 %prep
 %setup -qn vmime-%version
-%patch -P 1 -P 2 -p1
+%patch -P 1 -P 2 -P 3 -p1
 
 %build
 %if 0%{?with_pdf}
@@ -120,7 +121,7 @@ cmake . \
 	-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
 	-DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \
 	-DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
-	-DCMAKE_CXX_FLAGS_DEBUG:STRING="-g" \
+	-DCMAKE_CXX_FLAGS_DEBUG:STRING="-ggdb3 -O0" \
 %if 0%{?suse_version} >= 1310
 	-DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \
 %else