diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index ac3058e9fc70799def08975ebd91fe025e9e1e26..0a09b28662bd1b0d2bd57f2f88fc32ac84807841 100644
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -13,7 +13,7 @@ exampledirs = $SRCDIR
 extraimages.HTML        = qt-logo \
                           trolltech-logo
 
-sources.fileextensions  = "qtcreator.qdoc"
+sources.fileextensions  = "qtcreator.qdoc addressbook-sdk.qdoc"
 
 
 qhp.projects            = QtCreator
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 74a8def7b07163626116ef77d00838400f7b9c0a..c0506a222a87942d4dcf8d26a54a0f5bf936896a 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -178,7 +178,7 @@ WelcomeMode::WelcomeMode() :
     m_d->ui.tutorialTreeWidget->addItem(tr("<b>Qt Creator - A quick tour</b>"),
                                         QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR));
     m_d->ui.tutorialTreeWidget->addItem(tr("Creating an address book"),
-                                        QLatin1String("qthelp://com.trolltech.qt/qdoc/tutorials-addressbook.html"));
+                                        QLatin1String("qthelp://com.nokia.qtcreator/doc/tutorials-addressbook-sdk.html"));
     m_d->ui.tutorialTreeWidget->addItem(tr("Understanding widgets"),
                                         QLatin1String("qthelp://com.trolltech.qt/qdoc/widgets-tutorial.html"));
     m_d->ui.tutorialTreeWidget->addItem(tr("Building with qmake"),
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 22882ed6ebb9e1e34b198c7659ad10820391fd91..e79e617310c98e54fc7e5e6f9afe696f0aeb55e1 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -2315,7 +2315,8 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
 //     if (documentLayout->doubleMarkCount)
 //         markWidth += fm.lineSpacing() / 3;
 
-    const int extraAreaWidth = d->m_extraArea->width() - collapseBoxWidth(fm);
+    const int collapseColumnWidth = d->m_codeFoldingVisible ? collapseBoxWidth(fm): 0;
+    const int extraAreaWidth = d->m_extraArea->width() - collapseColumnWidth;
 
     painter.fillRect(e->rect(), pal.color(QPalette::Base));
     painter.fillRect(e->rect().intersected(QRect(0, 0, extraAreaWidth, INT_MAX)),