diff --git a/net.mornati.epomodoro/src/net/mornati/epomodoro/Activator.java b/net.mornati.epomodoro/src/net/mornati/epomodoro/Activator.java
index 3304a21..c55d0f6 100644
--- a/net.mornati.epomodoro/src/net/mornati/epomodoro/Activator.java
+++ b/net.mornati.epomodoro/src/net/mornati/epomodoro/Activator.java
@@ -235,6 +235,7 @@ public void run() {
 							}
 							//							countdown.setToolTipText(timer.getType() == PomodoroTimer.TYPE_PAUSE ? "Pause Timer" : "Work Timer");
 							countdown.setText(internalTimer.getFormatTime() + "   " + taskDescription );
+							adjustSize(countdown);
 						}
 					}
 					if (Activator.getDefault().isShowDialog()) {
@@ -249,6 +250,7 @@ public void run() {
 						if (!countdown.isDisposed()) {
 							countdown.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_RED));
 							countdown.setText(sdf.format(new Date(timer.getConfigWorkTime())) + "   " + taskDescription );
+							adjustSize(countdown);
 						}
 					}
 					scheduleTimer(changeInterval);
diff --git a/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferenceInitializer.java b/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferenceInitializer.java
index 523d9b8..652a79d 100644
--- a/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferenceInitializer.java
+++ b/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferenceInitializer.java
@@ -1,27 +1,28 @@
-package net.mornati.epomodoro.preference;
-
-import net.mornati.epomodoro.Activator;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-public class PomodoroPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	public PomodoroPreferenceInitializer() {
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store=Activator.getDefault().getPreferenceStore();
-		store.setDefault(PomodoroPreferencePage.GROUP_NAME, "MyTeam");
-		store.setDefault(PomodoroPreferencePage.CLIENT_NAME, "");
-		store.setDefault(PomodoroPreferencePage.POMODORO_TIME, "25");
-		store.setDefault(PomodoroPreferencePage.POMODORO_PAUSE, "5");
-		store.setDefault(PomodoroPreferencePage.WORK_PAUSE_AUTO_SWITCH, true);
-		store.setDefault(PomodoroPreferencePage.DISCARD_OWN_MESSAGE, false);
-		store.setDefault(PomodoroPreferencePage.SHOW_TIMER_STATUS_BAR, true);
-		store.setDefault(PomodoroPreferencePage.FORCE_IPV4, true);
-		store.setDefault(PomodoroPreferencePage.BIND_IP_ADDR, "");
-	}
-
-}
+package net.mornati.epomodoro.preference;
+
+import net.mornati.epomodoro.Activator;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+public class PomodoroPreferenceInitializer extends AbstractPreferenceInitializer {
+
+	public PomodoroPreferenceInitializer() {
+	}
+
+	@Override
+	public void initializeDefaultPreferences() {
+		IPreferenceStore store=Activator.getDefault().getPreferenceStore();
+		store.setDefault(PomodoroPreferencePage.GROUP_NAME, "MyTeam");
+		store.setDefault(PomodoroPreferencePage.CLIENT_NAME, "");
+		store.setDefault(PomodoroPreferencePage.POMODORO_TIME, "25");
+		store.setDefault(PomodoroPreferencePage.POMODORO_PAUSE, "5");
+		store.setDefault(PomodoroPreferencePage.WORK_PAUSE_AUTO_SWITCH, true);
+		store.setDefault(PomodoroPreferencePage.DISCARD_OWN_MESSAGE, false);
+		store.setDefault(PomodoroPreferencePage.SHOW_TIMER_STATUS_BAR, true);
+		store.setDefault(PomodoroPreferencePage.FORCE_IPV4, true);
+		store.setDefault(PomodoroPreferencePage.POMODORO_DESCRIPTION, false);
+		store.setDefault(PomodoroPreferencePage.BIND_IP_ADDR, "");
+	}
+
+}
diff --git a/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferencePage.java b/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferencePage.java
index 4ad4ac1..48a4e10 100644
--- a/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferencePage.java
+++ b/net.mornati.epomodoro/src/net/mornati/epomodoro/preference/PomodoroPreferencePage.java
@@ -1,46 +1,48 @@
-package net.mornati.epomodoro.preference;
-
-import net.mornati.epomodoro.Activator;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class PomodoroPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	public static final String GROUP_NAME="GROUP_NAME";
-	public static final String CLIENT_NAME="CLIENT_NAME";
-	public static final String POMODORO_TIME="POMODORO_TIME";
-	public static final String POMODORO_PAUSE="POMODORO_PAUSE";
-	public static final String WORK_PAUSE_AUTO_SWITCH="WORK_PAUSE_AUTO_SWITCH";
-	public static final String DISCARD_OWN_MESSAGE="DISCARD_OWN_MESSAGE";
-	public static final String SHOW_TIMER_STATUS_BAR="SHOW_TIMER_STATUS_BAR";
-	public static final String FORCE_IPV4="FORCE_IPV4";
-	public static final String BIND_IP_ADDR="BIND_IP_ADDR";
-
-	public PomodoroPreferencePage() {
-		super(GRID);
-
-	}
-
-	public void createFieldEditors() {
-		addField(new StringFieldEditor(GROUP_NAME, "Team Name:", getFieldEditorParent()));
-		addField(new StringFieldEditor(CLIENT_NAME, "Your Name:", getFieldEditorParent()));
-		addField(new IntegerFieldEditor(POMODORO_TIME, "Pomodoro Time (minutes):", getFieldEditorParent()));
-		addField(new IntegerFieldEditor(POMODORO_PAUSE, "Pomodoro Pause (minutes):", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(WORK_PAUSE_AUTO_SWITCH, "Auto start pause", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(DISCARD_OWN_MESSAGE, "Discard own message in team table", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(SHOW_TIMER_STATUS_BAR, "Show timer in status bar", getFieldEditorParent()));
-		addField(new BooleanFieldEditor(FORCE_IPV4, "Force IPv4", getFieldEditorParent()));
-		addField(new StringFieldEditor(BIND_IP_ADDR, "Bind IP Address (optional):", getFieldEditorParent()));
-	}
-
-	@Override
-	public void init(IWorkbench workbench) {
-		setPreferenceStore(Activator.getDefault().getPreferenceStore());
-		setDescription("ePomodoro Plugin Preference Page");
-	}
-}
+package net.mornati.epomodoro.preference;
+
+import net.mornati.epomodoro.Activator;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class PomodoroPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+	public static final String GROUP_NAME="GROUP_NAME";
+	public static final String CLIENT_NAME="CLIENT_NAME";
+	public static final String POMODORO_TIME="POMODORO_TIME";
+	public static final String POMODORO_PAUSE="POMODORO_PAUSE";
+	public static final String WORK_PAUSE_AUTO_SWITCH="WORK_PAUSE_AUTO_SWITCH";
+	public static final String DISCARD_OWN_MESSAGE="DISCARD_OWN_MESSAGE";
+	public static final String SHOW_TIMER_STATUS_BAR="SHOW_TIMER_STATUS_BAR";
+	public static final String FORCE_IPV4="FORCE_IPV4";
+	public static final String POMODORO_DESCRIPTION="POMODORO_DESCRIPTION";
+	public static final String BIND_IP_ADDR="BIND_IP_ADDR";
+
+	public PomodoroPreferencePage() {
+		super(GRID);
+
+	}
+
+	public void createFieldEditors() {
+		addField(new StringFieldEditor(GROUP_NAME, "Team Name:", getFieldEditorParent()));
+		addField(new StringFieldEditor(CLIENT_NAME, "Your Name:", getFieldEditorParent()));
+		addField(new IntegerFieldEditor(POMODORO_TIME, "Pomodoro Time (minutes):", getFieldEditorParent()));
+		addField(new IntegerFieldEditor(POMODORO_PAUSE, "Pomodoro Pause (minutes):", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(WORK_PAUSE_AUTO_SWITCH, "Auto start pause", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(DISCARD_OWN_MESSAGE, "Discard own message in team table", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(SHOW_TIMER_STATUS_BAR, "Show timer in status bar", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(FORCE_IPV4, "Force IPv4", getFieldEditorParent()));
+		addField(new BooleanFieldEditor(POMODORO_DESCRIPTION, "Set a Pomodoro description", getFieldEditorParent()));
+		addField(new StringFieldEditor(BIND_IP_ADDR, "Bind IP Address (optional):", getFieldEditorParent()));
+	}
+
+	@Override
+	public void init(IWorkbench workbench) {
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+		setDescription("ePomodoro Plugin Preference Page");
+	}
+}
diff --git a/net.mornati.epomodoro/src/net/mornati/epomodoro/util/UIUtil.java b/net.mornati.epomodoro/src/net/mornati/epomodoro/util/UIUtil.java
index c189764..6d8c3c6 100644
--- a/net.mornati.epomodoro/src/net/mornati/epomodoro/util/UIUtil.java
+++ b/net.mornati.epomodoro/src/net/mornati/epomodoro/util/UIUtil.java
@@ -1,116 +1,118 @@
-package net.mornati.epomodoro.util;
-
-import java.util.List;
-
-import net.mornati.epomodoro.Activator;
-import net.mornati.epomodoro.communication.TextMessage;
-
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-public class UIUtil {
-
-	public static Button createStartButton(Composite parent) {
-		final Button startButton=new Button(parent, SWT.FLAT);
-		startButton.addSelectionListener(new SelectionListener() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (Activator.getDefault().getTimer() != null && Activator.getDefault().getTimer().getStatus().equals(PomodoroTimer.STATUS_INITIALIZED)) {
-					if (Activator.getDefault().getTaskDescription().trim().equals("")) {
-						InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), 
-								"Adding a Task", "Enter a task description", "", null);
-						if (dlg.open() == Window.OK) {
-							Activator.getDefault().setTaskDescription(dlg.getValue());
-						}
-					}
-					Activator.getDefault().getTimer().start();
-				} else {
-					Activator.getDefault().getTimer().pause();
-				}
-				List<Button> startButtons=Activator.getDefault().getStartButtons();
-				for (final Button startButton : startButtons) {
-					if (!startButton.isDisposed()) {
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								addDetailsToButton(startButton);
-							}
-						});
-					}
-				}
-
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-
-			}
-		});
-		addDetailsToButton(startButton);
-		return startButton;
-	}
-
-	public static Button createResetButton(Composite parent) {
-		final Button resetButton=new Button(parent, SWT.FLAT);
-		resetButton.addSelectionListener(new SelectionListener() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				Activator.getDefault().resetTimer(Activator.getDefault().getTimer().getConfigWorkTime(), PomodoroTimer.TYPE_WORK);
-				List<Button> startButtons=Activator.getDefault().getStartButtons();
-				for (final Button startButton : startButtons) {
-					if (!startButton.isDisposed()) {
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								addDetailsToButton(startButton);
-							}
-						});
-					}
-				}
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-
-			}
-		});
-		resetButton.setImage(PluginImages.getImage(PluginImages.ICONS_RESET));
-		resetButton.setToolTipText("Reset");
-		return resetButton;
-
-	}
-
-	public static void showReceivedMessages() {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (Activator.getDefault().getCommunication().getReceivedMessages().size() > 0) {
-					String messages="";
-					for (TextMessage textMessage : Activator.getDefault().getCommunication().getReceivedMessages()) {
-						messages+=textMessage.getSender() + " - " + textMessage.getMessage() + "\n";
-					}
-					MessageDialog.openInformation(Display.getDefault().getActiveShell(), "Messages Received", messages);
-					Activator.getDefault().getCommunication().resetReceivedMessages();
-				}
-			}
-		});
-	}
-
-	private static void addDetailsToButton(Button startButton) {
-		String imagePath=Activator.getDefault().getTimer() != null
-				&& (Activator.getDefault().getTimer().getStatus().equals(PomodoroTimer.STATUS_WORKING_TIME) || Activator.getDefault().getTimer().getStatus()
-						.equals(PomodoroTimer.STATUS_PAUSING_TIME)) ? PluginImages.ICONS_PAUSE : PluginImages.ICONS_PLAY;
-		startButton.setImage(PluginImages.getImage(imagePath));
-		String tooltipText=Activator.getDefault().getTimer() != null
-				&& (Activator.getDefault().getTimer().getStatus().equals(PomodoroTimer.STATUS_WORKING_TIME) || Activator.getDefault().getTimer().getStatus()
-						.equals(PomodoroTimer.STATUS_PAUSING_TIME)) ? "Pause" : "Play";
-		startButton.setToolTipText(tooltipText);
-	}
-
-}
+package net.mornati.epomodoro.util;
+
+import java.util.List;
+
+import net.mornati.epomodoro.Activator;
+import net.mornati.epomodoro.communication.TextMessage;
+import net.mornati.epomodoro.preference.PomodoroPreferencePage;
+
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class UIUtil {
+
+	public static Button createStartButton(Composite parent) {
+		final Button startButton=new Button(parent, SWT.FLAT);
+		startButton.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if (Activator.getDefault().getTimer() != null && Activator.getDefault().getTimer().getStatus().equals(PomodoroTimer.STATUS_INITIALIZED)) {
+					boolean pomodoroDescription = Activator.getDefault().getPreferenceStore().getBoolean(PomodoroPreferencePage.POMODORO_DESCRIPTION);
+					if (pomodoroDescription && Activator.getDefault().getTaskDescription().trim().equals("")) {
+						InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), 
+								"Adding a Task", "Enter a task description", "", null);
+						if (dlg.open() == Window.OK) {
+							Activator.getDefault().setTaskDescription(dlg.getValue());
+						}
+					}
+					Activator.getDefault().getTimer().start();
+				} else {
+					Activator.getDefault().getTimer().pause();
+				}
+				List<Button> startButtons=Activator.getDefault().getStartButtons();
+				for (final Button startButton : startButtons) {
+					if (!startButton.isDisposed()) {
+						Display.getDefault().asyncExec(new Runnable() {
+							public void run() {
+								addDetailsToButton(startButton);
+							}
+						});
+					}
+				}
+
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+
+			}
+		});
+		addDetailsToButton(startButton);
+		return startButton;
+	}
+
+	public static Button createResetButton(Composite parent) {
+		final Button resetButton=new Button(parent, SWT.FLAT);
+		resetButton.addSelectionListener(new SelectionListener() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Activator.getDefault().resetTimer(Activator.getDefault().getTimer().getConfigWorkTime(), PomodoroTimer.TYPE_WORK);
+				List<Button> startButtons=Activator.getDefault().getStartButtons();
+				for (final Button startButton : startButtons) {
+					if (!startButton.isDisposed()) {
+						Display.getDefault().asyncExec(new Runnable() {
+							public void run() {
+								addDetailsToButton(startButton);
+							}
+						});
+					}
+				}
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+
+			}
+		});
+		resetButton.setImage(PluginImages.getImage(PluginImages.ICONS_RESET));
+		resetButton.setToolTipText("Reset");
+		return resetButton;
+
+	}
+
+	public static void showReceivedMessages() {
+		Display.getDefault().asyncExec(new Runnable() {
+			public void run() {
+				if (Activator.getDefault().getCommunication().getReceivedMessages().size() > 0) {
+					String messages="";
+					for (TextMessage textMessage : Activator.getDefault().getCommunication().getReceivedMessages()) {
+						messages+=textMessage.getSender() + " - " + textMessage.getMessage() + "\n";
+					}
+					MessageDialog.openInformation(Display.getDefault().getActiveShell(), "Messages Received", messages);
+					Activator.getDefault().getCommunication().resetReceivedMessages();
+				}
+			}
+		});
+	}
+
+	private static void addDetailsToButton(Button startButton) {
+		String imagePath=Activator.getDefault().getTimer() != null
+				&& (Activator.getDefault().getTimer().getStatus().equals(PomodoroTimer.STATUS_WORKING_TIME) || Activator.getDefault().getTimer().getStatus()
+						.equals(PomodoroTimer.STATUS_PAUSING_TIME)) ? PluginImages.ICONS_PAUSE : PluginImages.ICONS_PLAY;
+		startButton.setImage(PluginImages.getImage(imagePath));
+		String tooltipText=Activator.getDefault().getTimer() != null
+				&& (Activator.getDefault().getTimer().getStatus().equals(PomodoroTimer.STATUS_WORKING_TIME) || Activator.getDefault().getTimer().getStatus()
+						.equals(PomodoroTimer.STATUS_PAUSING_TIME)) ? "Pause" : "Play";
+		startButton.setToolTipText(tooltipText);
+	}
+
+}