diff --git a/src/catalog/gettext/gettextexport.cpp b/src/catalog/gettext/gettextexport.cpp
index 60cfd3c..5339a56 100644
--- a/src/catalog/gettext/gettextexport.cpp
+++ b/src/catalog/gettext/gettextexport.cpp
@@ -1,328 +1,328 @@
 /* ****************************************************************************
   This file is part of Lokalize
   This file contains parts of KBabel code
 
   Copyright (C) 1999-2000 by Matthias Kiefer <matthias.kiefer@gmx.de>
 		2001-2002 by Stanislav Visnovsky <visnovsky@kde.org>
   Copyright (C) 2005,2006 by Nicolas GOUTTE <goutte@kde.org>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
   the Qt library by Trolltech AS, Norway (or with modified versions
   of Qt that use the same license as Qt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
   Qt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
 
 **************************************************************************** */
 
 #include "gettextexport.h"
 
 #include "lokalize_debug.h"
 
 //#include <resources.h>
 #include "gettextstorage.h"
 #include "catalogitem.h"
 
 #include <QFile>
 #include <QTextCodec>
 #include <QList>
 #include <QTextStream>
 #include <QEventLoop>
 #include <QStringBuilder>
 
 
 using namespace GettextCatalog;
 
 GettextExportPlugin::GettextExportPlugin(short wrapWidth, short trailingNewLines)
     : m_wrapWidth(wrapWidth)
     , m_trailingNewLines(trailingNewLines)
 {
 }
 
 ConversionStatus GettextExportPlugin::save(QIODevice* device,
                                            const GettextStorage* catalog,
                                            QTextCodec* codec)
 {
     QTextStream stream(device);
     stream.setCodec(codec);
 
     //if ( m_wrapWidth == -1 ) m_wrapWidth=80;
 
     // only save header if it is not empty
     const QString& headerComment( catalog->m_header.comment() );
     // ### why is this useful to have a header with an empty msgstr?
     if ( !headerComment.isEmpty() || !catalog->m_header.msgstrPlural().isEmpty() )
     {
         // write header
         writeComment( stream, headerComment );
 
         const QString& headerMsgid (catalog->m_header.msgid());
 
         // Gettext PO files should have an empty msgid as header
         if ( !headerMsgid.isEmpty() )
         {
             // ### perhaps it is grave enough for a user message
             qCWarning(LOKALIZE_LOG) << "Non-empty msgid for the header, assuming empty msgid!" << endl << headerMsgid << "---";
         }
 
         // ### FIXME: if it is the header, then the msgid should be empty! (Even if KBabel has made something out of a non-header first entry!)
         stream << QStringLiteral("msgid \"\"\n");
 
         writeKeyword( stream, QStringLiteral("msgstr"), catalog->m_header.msgstr(), false );
     }
 
 
     const QVector<CatalogItem>& catalogEntries=catalog->m_entries;
     int limit=catalog->numberOfEntries();
     QStringList list;
     for (int counter = 0; counter < limit; counter++)
     {
         stream << '\n';
 
         const CatalogItem& catalogItem = catalogEntries.at(counter);
         // write entry
         writeComment( stream, catalogItem.comment() );
 
         const QString& msgctxt = catalogItem.msgctxt();
         if (! msgctxt.isEmpty() || catalogItem.keepEmptyMsgCtxt())
             writeKeyword( stream, QStringLiteral("msgctxt"), msgctxt );
 
         writeKeyword( stream, QStringLiteral("msgid"), catalogItem.msgid(), true, catalogItem.prependEmptyForMsgid() );
         if ( catalogItem.isPlural() )
             writeKeyword( stream, QStringLiteral("msgid_plural"), catalogItem.msgid(1), true, catalogItem.prependEmptyForMsgid() );
 
         if (!catalogItem.isPlural())
             writeKeyword( stream, QStringLiteral("msgstr"), catalogItem.msgstr(), true, catalogItem.prependEmptyForMsgstr() );
         else
         {
             qCDebug(LOKALIZE_LOG) << "Saving gettext plural form";
             //TODO check len of the actual stringlist??
             const int forms = catalog->numberOfPluralForms();
             for ( int i = 0; i < forms; ++i )
             {
                 QString keyword = QStringLiteral("msgstr[") % QString::number( i ) % ']';
                 writeKeyword( stream, keyword, catalogItem.msgstr(i), true, catalogItem.prependEmptyForMsgstr() );
             }
         }
     }
 
 #if 0
 //legacy
     if ( _saveSettings.saveObsolete )
 #endif
     {
         QList<QString>::const_iterator oit;
         const QStringList& _obsolete=catalog->m_catalogExtraData;
         oit=_obsolete.constBegin();
         if (oit!=_obsolete.constEnd())
         {
             stream << "\n" << (*oit);
             while((++oit)!=_obsolete.constEnd())
                 stream << "\n\n" << (*oit);
         }
     }
 
     int i=m_trailingNewLines+1;
     while (--i>=0)
         stream << '\n';
 
     return OK;
 }
 
 void GettextExportPlugin::writeComment( QTextStream& stream, const QString& comment ) const
 {
     if( !comment.isEmpty() )
     {
         // We must check that each comment line really starts with a #, to avoid syntax errors
         int pos = 0;
         for(;;)
         {
             const int newpos = comment.indexOf( '\n', pos, Qt::CaseInsensitive );
             if ( newpos == pos )
             {
                 ++pos;
                 stream << '\n';
                 continue;
             }
             const QString& span ((newpos==-1 ) ? comment.mid(pos) : comment.mid(pos, newpos-pos) );
 
             const int len = span.length();
             QString spaces; // Stored leading spaces
             for ( int i = 0 ; i < len ; ++i )
             {
                 const QChar& ch = span[ i ];
                 if ( ch == '#' )
                 {
                     stream << spaces << span.mid( i );
                     break;
                 }
                 else if ( ch == ' ' || ch == '\t' )
                 {
                     // We have a leading white space character, so store it temporary
                     spaces += ch;
                 }
                 else
                 {
                     // Not leading white space and not a # character. so consider that the # character was missing at first position.
                     stream << "# " << spaces << span.mid( i );
                     break;
                 }
             }
             stream << '\n';
 
             if ( newpos == -1 )
                 break;
             else
                 pos = newpos + 1;
         }
     }
 }
 
 void GettextExportPlugin::writeKeyword( QTextStream& stream, const QString& keyword, QString text, bool containsHtml, bool startedWithEmptyLine ) const
 {
     if ( text.isEmpty() )
     {
         // Whatever the wrapping mode, an empty line is an empty line
         stream << keyword << QStringLiteral(" \"\"\n");
         return;
     }
 
     text.replace(QLatin1Char('"'),QStringLiteral("\\\""));
 #if 0
     if ( m_wrapWidth == -1 )
     {
         // Traditional KBabel wrapping
         QStringList list = text.split( '\n', QString::SkipEmptyParts );
 
         if ( text.startsWith( '\n' ) )
             list.prepend( QString() );
 
         if(list.isEmpty())
             list.append( QString() );
 
         if( list.count() > 1 )
             list.prepend( QString() );
 
         stream << keyword << ' ';
 
         QStringList::const_iterator it;
         for( it = list.constBegin(); it != list.constEnd(); ++it )
             stream << '\"' << (*it) << "\"\n";
         return;
     }
 #endif
 
     if ( m_wrapWidth == 0 ) // Unknown special wrapping, so assume "no wrap" instead
     {
         // No wrapping (like Gettext's --no.wrap or -w0 )
         // we need to remove the \n characters, as they are extra characters
         QString realText( text );
         realText.remove( '\n' );
         stream << keyword << " \"" << realText << "\"\n";
         return;
     }
-    else if ( m_wrapWidth < 0 )
+    else if ( m_wrapWidth <= 3 )
     {
         // No change in wrapping
         QStringList list = text.split( '\n');
         if (list.count()>1 || startedWithEmptyLine /* || keyword.length()+3+text.length()>=80*/)
             list.prepend(QString());
 
         stream << keyword << QStringLiteral(" ");
         QStringList::const_iterator it;
         for( it = list.constBegin(); it != list.constEnd(); ++it )
             stream << QStringLiteral("\"") << (*it) << QStringLiteral("\"\n");
 
         return;
     }
 
     // lazy wrapping
     QStringList list = text.split( '\n', QString::SkipEmptyParts );
 
     if ( text.startsWith( '\n' ) )
         list.prepend( QString() );
 
     if(list.isEmpty())
         list.append( QString() );
 
     //static QRegExp breakStopReForHtml("[ >.%/:,]", Qt::CaseSensitive, QRegExp::Wildcard);
     //static QRegExp breakStopReForText("[ .%/:,]", Qt::CaseSensitive, QRegExp::Wildcard);
     static QRegExp breakStopReForHtml(QStringLiteral("[ >%]"), Qt::CaseSensitive, QRegExp::Wildcard);
     static QRegExp breakStopReForText(QStringLiteral("[ &%]"), Qt::CaseSensitive, QRegExp::Wildcard);
     QRegExp breakStopRe=containsHtml?breakStopReForHtml:breakStopReForText;
 
     int max=m_wrapWidth-2;
     bool prependedEmptyLine=false;
     QStringList::iterator itm;
     for( itm = list.begin(); itm != list.end(); ++itm )
     {
         if (list.count()==1 && keyword.length()+1+itm->length()>=max)
         {
             prependedEmptyLine=true;
             itm=list.insert(itm,QString());
         }
 
         if (itm->length()>max)
         {
             int pos = itm->lastIndexOf(breakStopRe,max-1);
             if (pos>(max/2))
             {
                 int pos2 = itm->indexOf(QLatin1Char('<'),pos);
                 if (pos2>0&&pos2<max-1)
                 {
                     pos=itm->indexOf(QLatin1Char('<'),pos);
                     ++pos;
                 }
             }
             else
             {
                 if (itm->at(max-1)==QLatin1Char('\\'))
                 {
                     do {--max;}
                     while (max>=2 && itm->at(max-1)==QLatin1Char('\\'));
                 }
                 pos=max;
                 //Restore the max variable to the m_wordWrap - 2 value
                 max=m_wrapWidth-2;
             }
             //itm=list.insert(itm,itm->left(pos));
             QString t=*itm;
             itm=list.insert(itm,t);
             ++itm;
             if (itm != list.end())
             {
                 (*itm)=itm->remove(0,pos);
                 --itm;
                 if (itm != list.end())
                     itm->truncate(pos);
             }
         }
     }
 
     if( !prependedEmptyLine && list.count() > 1 )
         list.prepend( QString() );
 
     stream << keyword << QStringLiteral(" ");
 
     QStringList::const_iterator it;
     for( it = list.constBegin(); it != list.constEnd(); ++it )
         stream << QStringLiteral("\"") << (*it) << QStringLiteral("\"\n");
 }