diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index 7b2540f..3281695 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 27 10:22:49 UTC 2012 - wr@rosenauer.org
+
+- fixed build with gcc 4.7
+
 -------------------------------------------------------------------
 Sat Apr 21 07:39:28 UTC 2012 - wr@rosenauer.org
 
diff --git a/mailnews-literals.patch b/mailnews-literals.patch
index 1f43474..3cc57cf 100644
--- a/mailnews-literals.patch
+++ b/mailnews-literals.patch
@@ -47,6 +47,25 @@ diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMs
          // if blockOffset is set, we added x-mozilla-status headers so
          // file pointer is already past them.
          if (!blockOffset)
+@@ -1211,17 +1211,17 @@ nsOfflineStoreCompactState::OnDataAvaila
+     if (NS_SUCCEEDED(rv))
+     {
+       if (m_startOfMsg)
+       {
+         m_startOfMsg = false;
+         // check if there's an envelope header; if not, write one.
+         if (strncmp(m_dataBuffer, "From ", 5))
+         {
+-          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
++          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
+           m_offlineMsgSize += bytesWritten;
+         }
+       }
+       m_fileStream->Write(m_dataBuffer, readCount, &bytesWritten);
+       m_offlineMsgSize += bytesWritten;
+       writeCount += bytesWritten;
+       count -= readCount;
+       if (writeCount != readCount)
 diff --git a/mailnews/compose/src/nsMsgAppleEncode.cpp b/mailnews/compose/src/nsMsgAppleEncode.cpp
 --- a/mailnews/compose/src/nsMsgAppleEncode.cpp
 +++ b/mailnews/compose/src/nsMsgAppleEncode.cpp