diff --git a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
index db797a72f..75d0f1d87 100644
--- a/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
+++ b/src/lib/marble/geodata/graphicsitem/GeoLineStringGraphicsItem.cpp
@@ -1,196 +1,202 @@
 //
 // This file is part of the Marble Virtual Globe.
 //
 // This program is free software licensed under the GNU LGPL. You can
 // find a copy of this license in LICENSE.txt in the top directory of
 // the source code.
 //
 // Copyright 2009      Andrew Manson <g.real.ate@gmail.com>
 //
 
 #include "GeoLineStringGraphicsItem.h"
 
 #include "GeoDataFeature.h"
 #include "GeoDataLineString.h"
 #include "GeoDataLineStyle.h"
 #include "GeoPainter.h"
 #include "ViewportParams.h"
 #include "GeoDataStyle.h"
 #include "MarbleDebug.h"
 
 namespace Marble
 {
 
 GeoLineStringGraphicsItem::GeoLineStringGraphicsItem( const GeoDataFeature *feature,
                                                       const GeoDataLineString* lineString )
         : GeoGraphicsItem( feature ),
           m_lineString( lineString )
 {
     QString const category = GeoDataFeature::visualCategoryName(feature->visualCategory());
     QStringList paintLayers;
     paintLayers << QString("LineString/%1/outline").arg(category);
     paintLayers << QString("LineString/%1/inline").arg(category);
     paintLayers << QString("LineString/%1/label").arg(category);
     setPaintLayers(paintLayers);
 }
 
 
 void GeoLineStringGraphicsItem::setLineString( const GeoDataLineString* lineString )
 {
     m_lineString = lineString;
 }
 
 const GeoDataLatLonAltBox& GeoLineStringGraphicsItem::latLonAltBox() const
 {
     return m_lineString->latLonAltBox();
 }
 
 void GeoLineStringGraphicsItem::paint(GeoPainter* painter, const ViewportParams* viewport , const QString &layer)
 {
     if (layer.endsWith("/outline")) {
-        paintOutline(painter, viewport);
+        if (painter->mapQuality() == HighQuality || painter->mapQuality() == PrintQuality) {
+            paintOutline(painter, viewport);
+        }
     } else if (layer.endsWith("/label")) {
         paintLabel(painter, viewport);
     } else if (layer.endsWith("/inline")) {
         paintInline(painter, viewport);
     } else {
         painter->drawPolyline(*m_lineString);
     }
 }
 
 void GeoLineStringGraphicsItem::paintInline(GeoPainter* painter, const ViewportParams* viewport)
 {
     if ( ( !viewport->resolves( m_lineString->latLonAltBox(), 2) ) ) {
         return;
     }
 
     painter->save();
     LabelPositionFlags labelPositionFlags = NoLabel;
     QPen currentPen = configurePainter(painter, viewport, labelPositionFlags);
 
 
     if( style()->lineStyle().cosmeticOutline() &&
         style()->lineStyle().penStyle() == Qt::SolidLine ) {
         if ( currentPen.widthF() > 2.5f ) {
             currentPen.setWidthF( currentPen.widthF() - 2.0f );
         }
         currentPen.setColor( style()->polyStyle().paintedColor() );
         painter->setPen( currentPen );
         painter->drawPolyline(*m_lineString);
     } else {
         painter->drawPolyline(*m_lineString);
     }
     
 
     painter->restore();
 }
 
 void GeoLineStringGraphicsItem::paintOutline(GeoPainter *painter, const ViewportParams *viewport)
 {
     if ( ( !viewport->resolves( m_lineString->latLonAltBox(), 2) ) ) {
         return;
     }
 
     painter->save();
     LabelPositionFlags labelPositionFlags = NoLabel;
     QPen currentPen = configurePainter(painter, viewport, labelPositionFlags);
     if (!( currentPen.widthF() < 2.5f )) {
         painter->drawPolyline(*m_lineString);
     }
     painter->restore();
 }
 
 void GeoLineStringGraphicsItem::paintLabel(GeoPainter *painter, const ViewportParams *viewport)
 {
     if ( ( !viewport->resolves( m_lineString->latLonAltBox(), 2) ) ) {
         return;
     }
 
     painter->save();
     LabelPositionFlags labelPositionFlags = NoLabel;
     QPen currentPen = configurePainter(painter, viewport, labelPositionFlags);
 
     if (!( currentPen.widthF() < 2.5f )) {
         QPen pen = QPen(QColor(Qt::transparent));
         pen.setWidthF(currentPen.widthF());
         painter->setPen(pen);
         // Activate the lines below to paint a label background which
         // prevents antialiasing overpainting glitches, but leads to
         // other glitches.
         //QColor const color = style()->polyStyle().paintedColor();
         //painter->setBackground(QBrush(color));
         //painter->setBackgroundMode(Qt::OpaqueMode);
         painter->drawPolyline( *m_lineString, feature()->name(), FollowLine,
                                style()->labelStyle().paintedColor(),
                                style()->labelStyle().font());
     }
 
     painter->restore();
 }
 
 QPen GeoLineStringGraphicsItem::configurePainter(GeoPainter *painter, const ViewportParams *viewport, LabelPositionFlags &labelPositionFlags) const
 {
     QPen currentPen = painter->pen();
     if ( !style() ) {
         painter->setPen( QPen() );
     }
     else {
 
         if ( currentPen.color() != style()->lineStyle().paintedColor() )
             currentPen.setColor( style()->lineStyle().paintedColor() );
 
         if ( currentPen.widthF() != style()->lineStyle().width() ||
                 style()->lineStyle().physicalWidth() != 0.0 ) {
             if ( float( viewport->radius() ) / EARTH_RADIUS * style()->lineStyle().physicalWidth() < style()->lineStyle().width() )
                 currentPen.setWidthF( style()->lineStyle().width() );
             else
                 currentPen.setWidthF( float( viewport->radius() ) / EARTH_RADIUS * style()->lineStyle().physicalWidth() );
         }
         else if ( style()->lineStyle().width() != 0.0 ) {
             currentPen.setWidthF( style()->lineStyle().width() );
         }
 
         if ( currentPen.capStyle() != style()->lineStyle().capStyle() )
             currentPen.setCapStyle( style()->lineStyle().capStyle() );
 
-        if ( currentPen.style() != style()->lineStyle().penStyle() )
-            currentPen.setStyle( style()->lineStyle().penStyle() );
+        if (painter->mapQuality() == HighQuality || painter->mapQuality() == PrintQuality) {
+            if ( currentPen.style() != style()->lineStyle().penStyle() )
+                currentPen.setStyle( style()->lineStyle().penStyle() );
 
-        if ( style()->lineStyle().penStyle() == Qt::CustomDashLine )
-            currentPen.setDashPattern( style()->lineStyle().dashPattern() );
+            if ( style()->lineStyle().penStyle() == Qt::CustomDashLine )
+                currentPen.setDashPattern( style()->lineStyle().dashPattern() );
+        } else {
+            currentPen.setStyle(Qt::SolidLine);
+        }
 
         if ( painter->mapQuality() != Marble::HighQuality
                 && painter->mapQuality() != Marble::PrintQuality ) {
             QColor penColor = currentPen.color();
             penColor.setAlpha( 255 );
             currentPen.setColor( penColor );
         }
 
         if ( painter->pen() != currentPen )
             painter->setPen( currentPen );
 
         if ( style()->lineStyle().background() ) {
             QBrush brush = painter->background();
             brush.setColor( style()->polyStyle().paintedColor() );
             painter->setBackground( brush );
 
             painter->setBackgroundMode( Qt::OpaqueMode );
         }
 
         // label styles
         painter->setFont( style()->labelStyle().font() );
         switch ( style()->labelStyle().alignment() ) {
         case GeoDataLabelStyle::Corner:
         case GeoDataLabelStyle::Right:
             labelPositionFlags |= LineStart;
             break;
         case GeoDataLabelStyle::Center:
             labelPositionFlags |= LineCenter;
             break;
         }
     }
 
     return currentPen;
 }
 
 }