diff --git a/configuredialog.cpp b/configuredialog.cpp
index 281ee345c..dd41d28ad 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -2886,6 +2886,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( QWidget * parent )
   QLabel      *label;
   QPushButton *button;
 
+  mBlockSignal = false;
   vlay = new QVBoxLayout( this );
   vlay->setSpacing( KDialog::spacingHint() );
   vlay->setMargin( KDialog::marginHint() );
@@ -2974,6 +2975,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( QWidget * parent )
 
 void ComposerPage::HeadersTab::slotMimeHeaderSelectionChanged()
 {
+  mBlockSignal = true;
   QTreeWidgetItem * item = mTagList->currentItem();
 
   if ( item ) {
@@ -2988,6 +2990,7 @@ void ComposerPage::HeadersTab::slotMimeHeaderSelectionChanged()
   mTagValueEdit->setEnabled( item );
   mTagNameLabel->setEnabled( item );
   mTagValueLabel->setEnabled( item );
+  mBlockSignal = false;
 }
 
 
@@ -2998,7 +3001,8 @@ void ComposerPage::HeadersTab::slotMimeHeaderNameChanged( const QString & text )
   QTreeWidgetItem * item = mTagList->currentItem();
   if ( item )
     item->setText( 0, text );
-  emit changed( true );
+  if(!mBlockSignal)
+      emit changed( true );
 }
 
 
@@ -3009,7 +3013,8 @@ void ComposerPage::HeadersTab::slotMimeHeaderValueChanged( const QString & text
   QTreeWidgetItem * item = mTagList->currentItem();
   if ( item )
     item->setText( 1, text );
-  emit changed( true );
+  if(!mBlockSignal)
+      emit changed( true );
 }
 
 
diff --git a/configuredialog_p.h b/configuredialog_p.h
index 49e050915..5316edf40 100644
--- a/configuredialog_p.h
+++ b/configuredialog_p.h
@@ -656,6 +656,7 @@ private:
   KLineEdit   *mTagValueEdit;
   QLabel      *mTagNameLabel;
   QLabel      *mTagValueLabel;
+  bool        mBlockSignal;
 };
 
 class ComposerPageAttachmentsTab : public ConfigModuleTab {