--- a/emailuis/nmailui/src/nmviewerview.cpp	Tue Jul 06 14:04:34 2010 +0300
+++ b/emailuis/nmailui/src/nmviewerview.cpp	Wed Aug 18 09:37:47 2010 +0300
@@ -34,6 +34,9 @@
 static const QString NmHttpsLinkScheme = "https";
 static const QString NmMailtoLinkScheme = "mailto";
 
+// Local constants
+const qreal NmZoomFactor = 1.5;
+
 /*!
 	\class NmViewerView
 	\brief Mail viewer class
@@ -182,7 +185,8 @@
                 mHeaderWidget->setView(this);
                 mHeaderWidget->rescaleHeader(mScreenSize);
                 mHeaderWidget->setMessage(mMessage);
-                mHeaderStartScenePos = mHeaderWidget->scenePos();
+                QPointF headerStartPos = mHeaderWidget->scenePos();
+                mHeaderStartScenePos = QPointF(0,headerStartPos.y());
             }
 
             // Load webview
@@ -193,7 +197,7 @@
                 QWebSettings *settings = mWebView->settings();
                 if (settings) {
                     settings->setAttribute(QWebSettings::AutoLoadImages, true);
-                    settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);   
+                    settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
                 }
                 QWebPage *page = mWebView->page();
                 if (page) {
@@ -201,6 +205,7 @@
                     if (frame) {
                         frame->setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
                         frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+                        frame->setTextSizeMultiplier(NmZoomFactor);
                         connect(mWebView->page()->mainFrame(),
                                 SIGNAL(contentsSizeChanged(const QSize&)),
                             this, SLOT(scaleWebViewWhenLoading(const QSize&)));  
@@ -687,7 +692,7 @@
             else {
                 mWebView->setPreferredWidth(width);
             }
-            mWebView->setPreferredHeight(height);        
+            mWebView->setMinimumHeight(height);
         }
     }
     mLatestLoadingSize = size;
@@ -701,12 +706,9 @@
     QRectF myGeometry = geometry();
     QWebPage *page = mWebView->page();
     if (mWebView && page) {
-        page->setViewportSize(myGeometry.size().toSize());
+        page->setPreferredContentsSize(myGeometry.size().toSize());
         QSizeF contentSize = page->mainFrame()->contentsSize();
-        int width = (int)contentSize.width();
-        int height = (int)contentSize.height();  
-        mWebView->setPreferredWidth(width);
-        mWebView->setPreferredHeight(height);
+        mWebView->setPreferredSize(contentSize);
     }
 }