diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
@@ -41,7 +41,7 @@ class QgsRasterRenderer
       void* data;
     };
 
-    QgsRasterRenderer( QgsRasterDataProvider* provider, QgsRasterResampler* resampler = 0 );
+    QgsRasterRenderer( QgsRasterDataProvider* provider );
     virtual ~QgsRasterRenderer();
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel ) = 0;
 
@@ -59,6 +59,14 @@ class QgsRasterRenderer
     void setInvertColor( bool invert ) { mInvertColor = invert; }
     bool invertColor() const { return mInvertColor; }
 
+    /**Set resampler for zoomed in scales. Takes ownership of the object*/
+    void setZoomedInResampler( QgsRasterResampler* r );
+    const QgsRasterResampler* zoomedInResampler() const { return mZoomedInResampler; }
+
+    /**Set resampler for zoomed out scales. Takes ownership of the object*/
+    void setZoomedOutResampler( QgsRasterResampler* r );
+    const QgsRasterResampler* zoomedOutResampler() const { return mZoomedOutResampler; }
+
   protected:
     inline double readValue( void *data, QgsRasterDataProvider::DataType type, int index );
 
@@ -70,7 +78,10 @@ class QgsRasterRenderer
 
 
     QgsRasterDataProvider* mProvider;
-    QgsRasterResampler* mResampler;
+    /**Resampler used if screen resolution is higher than raster resolution (zoomed in). 0 means no resampling (nearest neighbour)*/
+    QgsRasterResampler* mZoomedInResampler;
+    /**Resampler used if raster resolution is higher than raster resolution (zoomed out). 0 mean no resampling (nearest neighbour)*/
+    QgsRasterResampler* mZoomedOutResampler;
     QMap<int, RasterPartInfo> mRasterPartInfos;
 
     /**Global alpha value (0-1)*/

diff --git a/src/core/raster/qgssinglebandcolordatarenderer.cpp b/src/core/raster/qgssinglebandcolordatarenderer.cpp
@@ -19,8 +19,8 @@
 #include "qgsrasterviewport.h"
 #include <QImage>
 
-QgsSingleBandColorDataRenderer::QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band, QgsRasterResampler* resampler ):
-    QgsRasterRenderer( provider, resampler ), mBand( band )
+QgsSingleBandColorDataRenderer::QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band ):
+    QgsRasterRenderer( provider ), mBand( band )
 {
 
 }
@@ -52,7 +52,7 @@ void QgsSingleBandColorDataRenderer::draw( QPainter* p, QgsRasterViewPort* viewP
     for ( int i = 0; i < nRows; ++i )
     {
       scanLine = img.scanLine( i );
-      if( !hasTransparency )
+      if ( !hasTransparency )
       {
         memcpy( scanLine, &((( uint* )rasterData )[currentRasterPos] ), nCols * 4 );
         currentRasterPos += nCols;
@@ -61,7 +61,7 @@ void QgsSingleBandColorDataRenderer::draw( QPainter* p, QgsRasterViewPort* viewP
       {
         for ( int j = 0; j < nCols; ++j )
         {
-          QRgb c( ( (uint*)(rasterData) )[currentRasterPos] );
+          QRgb c((( uint* )( rasterData ) )[currentRasterPos] );
           scanLine[i] = qRgba( qRed( c ), qGreen( c ), qBlue( c ), 255 );
           ++currentRasterPos;
         }

diff --git a/src/core/raster/qgssinglebandcolordatarenderer.h b/src/core/raster/qgssinglebandcolordatarenderer.h
@@ -23,7 +23,7 @@
 class QgsSingleBandColorDataRenderer: public QgsRasterRenderer
 {
   public:
-    QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band, QgsRasterResampler* resampler = 0 );
+    QgsSingleBandColorDataRenderer( QgsRasterDataProvider* provider, int band );
     ~QgsSingleBandColorDataRenderer();
 
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );

diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -20,8 +20,8 @@
 #include "qgsrastertransparency.h"
 #include <QImage>
 
-QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand, QgsRasterResampler* resampler ):
-    QgsRasterRenderer( provider, resampler ), mGrayBand( grayBand ), mContrastEnhancement( 0 )
+QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand ):
+    QgsRasterRenderer( provider ), mGrayBand( grayBand ), mContrastEnhancement( 0 )
 {
 }
 

diff --git a/src/core/raster/qgssinglebandgrayrenderer.h b/src/core/raster/qgssinglebandgrayrenderer.h
@@ -25,7 +25,7 @@ class QgsContrastEnhancement;
 class QgsSingleBandGrayRenderer: public QgsRasterRenderer
 {
   public:
-    QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand, QgsRasterResampler* resampler = 0 );
+    QgsSingleBandGrayRenderer( QgsRasterDataProvider* provider, int grayBand );
     ~QgsSingleBandGrayRenderer();
 
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );

diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -21,8 +21,8 @@
 #include "qgsrasterviewport.h"
 #include <QImage>
 
-QgsSingleBandPseudoColorRenderer::QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader, QgsRasterResampler* resampler ):
-    QgsRasterRenderer( provider, resampler ), mShader( shader ), mBand( band )
+QgsSingleBandPseudoColorRenderer::QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader ):
+    QgsRasterRenderer( provider ), mShader( shader ), mBand( band )
 {
 }
 

diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.h b/src/core/raster/qgssinglebandpseudocolorrenderer.h
@@ -25,7 +25,7 @@ class QgsRasterShader;
 class QgsSingleBandPseudoColorRenderer: public QgsRasterRenderer
 {
   public:
-    QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader, QgsRasterResampler* resampler = 0 );
+    QgsSingleBandPseudoColorRenderer( QgsRasterDataProvider* provider, int band, QgsRasterShader* shader );
     ~QgsSingleBandPseudoColorRenderer();
 
     virtual void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );

diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>691</width>
-    <height>591</height>
+    <height>598</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -756,27 +756,26 @@
           <string>Resampling</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_7">
-          <item row="0" column="0">
-           <widget class="QRadioButton" name="mNearestNeighbourRadioButton">
-            <property name="text">
-             <string>Nearest neighbour</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="0">
-           <widget class="QRadioButton" name="mBilinearRadioButton">
+           <widget class="QComboBox" name="mZoomedInResamplingComboBox"/>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="mZoomedInResamplingLabel">
             <property name="text">
-             <string>Bilinear</string>
+             <string>Zoomed in</string>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
-           <widget class="QRadioButton" name="mCubicRadioButton">
+           <widget class="QLabel" name="mZoomedOutResamplingLabel">
             <property name="text">
-             <string>Cubic</string>
+             <string>Zoomed out</string>
             </property>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QComboBox" name="mZoomedOutResamplingComboBox"/>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1834,6 +1833,7 @@ p, li { white-space: pre-wrap; }
 &lt;td style=&quot;border: none;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;/p&gt;