diff --git a/database/clouduse.sqlt b/database/clouduse.sqlt
index 3ce3610..0ae1f64 100644
Binary files a/database/clouduse.sqlt and b/database/clouduse.sqlt differ
diff --git a/database/localuse.sqlt b/database/localuse.sqlt
index 197423c..59f683e 100644
Binary files a/database/localuse.sqlt and b/database/localuse.sqlt differ
diff --git a/main.py b/main.py
index 92a2d3c..c3fd0e7 100644
--- a/main.py
+++ b/main.py
@@ -21,10 +21,22 @@ def dashbord():
     else:
         return redirect(url_for("invalses"))
 
+
+@main.route("/makemail/<receiver>", methods=["GET", "POST"])
 @main.route("/makemail/", methods=["GET", "POST"])
-def makemail(erorcode=""):
+def makemail(erorcode="",receiver=""):
+    #print ("URL",request.remote_addr)
+    #print (" "*25,"receiver : ",receiver," "*25)
+    
     if 'username' in session:
         username = session['username']
+        if receiver !="" :
+            srchuser = libr_makemail.acntexst(receiver)
+            #print(srchuser)
+            if srchuser == False or receiver == username:
+                receiver=""
+                return redirect(url_for("makemail"))
+        
         if request.method == "POST":
             receiver = request.form["receiver"]
             subjtext = request.form["subjtext"]
@@ -44,7 +56,8 @@ def makemail(erorcode=""):
                 else:
                     erorcode = "mailsucc"
                     libr_makemail.sendmail(subjtext, conttext, username, receiver)
-        return render_template("makemoil.html", username=username, versinfo=versinfo, erorlist=erorlist, erorcode=erorcode)
+                    return redirect(url_for('makemail'))
+        return render_template("makemoil.html", username=username,receiver=receiver ,versinfo=versinfo, erorlist=erorlist, erorcode=erorcode)
     else:
         return redirect(url_for("invalses"))
 
@@ -314,4 +327,4 @@ def makeacnt(erorcode = ""):
     return render_template("makeocnt.html", versinfo=versinfo, erorlist=erorlist, erorcode=erorcode)
 
 if __name__ == "__main__":
-    main.run(port=9696, host="0.0.0.0")
\ No newline at end of file
+    main.run()
\ No newline at end of file
diff --git a/templates/contocts.html b/templates/contocts.html
index 5227ca7..ca5b1c4 100644
--- a/templates/contocts.html
+++ b/templates/contocts.html
@@ -142,7 +142,9 @@ <h3 class="card-title">Saved contacts</h3>
 							{{ indx.username }}
 						</a>
 						<br/>
-						<small>{{ indx.fullname }}</small>
+						<a href="{{ url_for('makemail',receiver=indx.username) }}" >
+							<small>{{ indx.fullname }}</small>
+						</a>
 					</div>
 					<br/>
 					{% endfor %}
diff --git a/templates/makemoil.html b/templates/makemoil.html
index 44f176b..86a8c2c 100644
--- a/templates/makemoil.html
+++ b/templates/makemoil.html
@@ -101,7 +101,11 @@ <h3 class="card-title">Compose new message</h3>
         <form id="makemail" method="POST">
           <div class="card-body">
             <div class="form-group">
-              <input class="form-control" name="receiver" placeholder="Add the username of the receiver" />
+              {% if receiver!="" %}
+                <input class="form-control" name="receiver" value='{{ receiver }}' placeholder="Add the username of the receiver" readonly/>
+              {% else %}
+                <input class="form-control" name="receiver" placeholder="Add the username of the receiver" />
+              {% endif %}
             </div>
             <div class="form-group">
               <input class="form-control" name="subjtext" placeholder="Add the subject of your directive" />