diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php
index 5667c49747..056311e5d2 100644
--- a/felamimail/inc/class.uicompose.inc.php
+++ b/felamimail/inc/class.uicompose.inc.php
@@ -237,6 +237,7 @@
 			$this->t->set_var('addressbookImage',$GLOBALS['egw']->common->image('phpgwapi/templates/phpgw_website','users'));
 			$this->t->set_var('infologImage',$GLOBALS['egw']->html->image('felamimail','to_infolog',lang('Save as infolog'),'width="17px" height="17px" valign="middle"' ));
 			$this->t->set_var('lang_save_as_infolog',lang('Save as infolog'));
+			$this->t->set_var('lang_no_recipient',lang('No recipient address given!'));
 			$this->t->pparse("out","header");
 			
 
diff --git a/felamimail/setup/phpgw_de.lang b/felamimail/setup/phpgw_de.lang
index 7c4c464199..dce6c31a3e 100644
--- a/felamimail/setup/phpgw_de.lang
+++ b/felamimail/setup/phpgw_de.lang
@@ -266,6 +266,7 @@ no messages found...	felamimail	de	keine Nachrichten gefunden...
 no messages were selected.	felamimail	de	Es wurde keine NAchricht ausgewählt
 no plain text part found	felamimail	de	Kein Text Teil gefunden.
 no previous message	felamimail	de	Keine vorherige Nachricht vorhanden
+no recipient address given!	felamimail	en	Keine Empfängeradresse angegeben!
 no supported imap authentication method could be found.	felamimail	de	Keine unterstützte IMAP Authentifizierungsmethode gefunden.
 no valid emailprofile selected!!	felamimail	de	Sie haben kein gültiges E-Mail-Profil ausgewählt!
 none	felamimail	de	kein
diff --git a/felamimail/setup/phpgw_en.lang b/felamimail/setup/phpgw_en.lang
index 95d5fb4258..a1673d5a0c 100644
--- a/felamimail/setup/phpgw_en.lang
+++ b/felamimail/setup/phpgw_en.lang
@@ -266,6 +266,7 @@ no messages found...	felamimail	en	no messages found...
 no messages were selected.	felamimail	en	No messages were selected.
 no plain text part found	felamimail	en	no plain text part found
 no previous message	felamimail	en	no previous Message
+no recipient address given!	felamimail	en	No recipient address given!
 no supported imap authentication method could be found.	felamimail	en	No supported IMAP authentication method could be found.
 no valid emailprofile selected!!	felamimail	en	No Valid Email Profile Selected!!
 none	felamimail	en	none
diff --git a/felamimail/templates/default/composeForm.tpl b/felamimail/templates/default/composeForm.tpl
index 18aefb4c0f..393822575e 100644
--- a/felamimail/templates/default/composeForm.tpl
+++ b/felamimail/templates/default/composeForm.tpl
@@ -18,10 +18,23 @@
 	function attach_window(url) {
 		awin = window.open(url,"attach","width=500,height=400,toolbar=no,resizable=yes");
 	}
+	
+	function check_sender()
+	{
+		var tos = document.getElementsByName('address[]');
+		for(i=0; i < tos.length; ++i) {
+			if (tos[i].value != '') break;
+		}
+		if (i >= tos.length) {
+			alert('{lang_no_recipient}');
+			return false;
+		}
+		return true;
+	}
 </script>
 
 <center>
-<form method="post" name="doit" action="{link_action}" ENCTYPE="multipart/form-data">
+<form method="post" name="doit" action="{link_action}" ENCTYPE="multipart/form-data" onsubmit="return check_sender();">
 <input type="hidden" id="saveAsDraft" name="saveAsDraft" value="0">
 <TABLE WIDTH="100%" CELLPADDING="1" CELLSPACING="0" style="border: solid #aaaaaa 1px; border-right: solid black 1px; border-bottom: solid black 1px;">
 	<tr class="navbarBackground">