diff --git a/client/index.html b/client/index.html
index e4752dbe..cbbaa662 100644
--- a/client/index.html
+++ b/client/index.html
@@ -65,6 +65,10 @@
         <h2>Open Snapdrop on other devices to send files</h2>
     </x-no-peers>
     <x-instructions desktop="Click to send files or right click to send a message" mobile="Tap to send files or long tap to send a message"></x-instructions>
+    <x-paste-area contenteditable="true" inputmode="none" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-gramm="false">
+        <span>Or paste file/text here</span>
+        <a class="button" close hidden>Cancel</a>
+    </x-paste-area>
     <!-- Footer -->
     <footer class="column">
         <svg class="icon logo">
diff --git a/client/mime.types b/client/mime.types
new file mode 100644
index 00000000..10585da4
--- /dev/null
+++ b/client/mime.types
@@ -0,0 +1,879 @@
+# source: https://github.com/mime-types/mime-types-data/blob/main/data/content_type_mime.db
+ez          application/andrew-inset                                                  base64
+aw          application/applixware                                                    base64
+atom        application/atom+xml                                                      8bit
+atomcat     application/atomcat+xml                                                   8bit
+atomsvc     application/atomsvc+xml                                                   8bit
+ccxml       application/ccxml+xml                                                     base64
+cdmia       application/cdmi-capability                                               base64
+cdmic       application/cdmi-container                                                base64
+cdmid       application/cdmi-domain                                                   base64
+cdmio       application/cdmi-object                                                   base64
+cdmiq       application/cdmi-queue                                                    base64
+cu          application/cu-seeme                                                      base64
+davmount    application/davmount+xml                                                  base64
+dcm         application/dicom                                                         base64
+dbk         application/docbook+xml                                                   base64
+dssc        application/dssc+der                                                      base64
+xdssc       application/dssc+xml                                                      base64
+ecma        application/ecmascript                                                    base64
+emma        application/emma+xml                                                      base64
+epub        application/epub+zip                                                      base64
+exi         application/exi                                                           base64
+pfr         application/font-tdpfr                                                    base64
+gml         application/gml+xml                                                       base64
+gpx         application/gpx+xml                                                       base64
+gxf         application/gxf                                                           base64
+gz          application/gzip                                                          base64
+stk         application/hyperstudio                                                   base64
+ink         application/inkml+xml                                                     base64
+ipfix       application/ipfix                                                         base64
+jar         application/java-archive                                                  base64
+ser         application/java-serialized-object                                        base64
+js          application/javascript                                                    8bit
+json        application/json                                                          8bit
+jsonml      application/jsonml+json                                                   base64
+lostxml     application/lost+xml                                                      base64
+hqx         application/mac-binhex40                                                  8bit
+mads        application/mads+xml                                                      base64
+webmanifest application/manifest+json                                                 base64
+mrc         application/marc                                                          base64
+mrcx        application/marcxml+xml                                                   base64
+ma          application/mathematica                                                   base64
+mathml      application/mathml+xml                                                    base64
+mbox        application/mbox                                                          base64
+mscml       application/mediaservercontrol+xml                                        base64
+metalink    application/metalink+xml                                                  base64
+meta4       application/metalink4+xml                                                 base64
+mets        application/mets+xml                                                      base64
+mods        application/mods+xml                                                      base64
+m21         application/mp21                                                          base64
+mp4         application/mp4                                                           base64
+doc         application/msword                                                        base64
+mxf         application/mxf                                                           base64
+nc          application/netcdf                                                        base64
+bin         application/octet-stream                                                  base64
+oda         application/oda                                                           base64
+opf         application/oebps-package+xml                                             base64
+ogx         application/ogg                                                           base64
+omdoc       application/omdoc+xml                                                     base64
+onepkg      application/onenote                                                       base64
+oxps        application/oxps                                                          base64
+xer         application/patch-ops-error+xml                                           base64
+pdf         application/pdf                                                           base64
+asc         application/pgp-signature                                                 base64
+prf         application/pics-rules                                                    base64
+p10         application/pkcs10                                                        base64
+p7m         application/pkcs7-mime                                                    base64
+p7s         application/pkcs7-signature                                               base64
+p8          application/pkcs8                                                         base64
+ac          application/pkix-attr-cert                                                base64
+cer         application/pkix-cert                                                     base64
+crl         application/pkix-crl                                                      base64
+pkipath     application/pkix-pkipath                                                  base64
+pki         application/pkixcmp                                                       base64
+pls         application/pls+xml                                                       base64
+eps         application/postscript                                                    8bit
+cw          application/prs.cww                                                       base64
+rnd         application/prs.nprend                                                    base64
+pskcxml     application/pskc+xml                                                      base64
+rdf         application/rdf+xml                                                       8bit
+rif         application/reginfo+xml                                                   base64
+rnc         application/relax-ng-compact-syntax                                       base64
+rl          application/resource-lists+xml                                            base64
+rld         application/resource-lists-diff+xml                                       base64
+rs          application/rls-services+xml                                              base64
+gbr         application/rpki-ghostbusters                                             base64
+mft         application/rpki-manifest                                                 base64
+roa         application/rpki-roa                                                      base64
+rsd         application/rsd+xml                                                       base64
+rss         application/rss+xml                                                       base64
+rtf         application/rtf                                                           base64
+sbml        application/sbml+xml                                                      base64
+scq         application/scvp-cv-request                                               base64
+scs         application/scvp-cv-response                                              base64
+spq         application/scvp-vp-request                                               base64
+spp         application/scvp-vp-response                                              base64
+sdp         application/sdp                                                           base64
+setpay      application/set-payment-initiation                                        base64
+setreg      application/set-registration-initiation                                   base64
+sgml        application/sgml                                                          base64
+soc         application/sgml-open-catalog                                             base64
+shf         application/shf+xml                                                       base64
+siv         application/sieve                                                         base64
+smi         application/smil+xml                                                      8bit
+rq          application/sparql-query                                                  base64
+srx         application/sparql-results+xml                                            base64
+gram        application/srgs                                                          base64
+grxml       application/srgs+xml                                                      base64
+sru         application/sru+xml                                                       base64
+ssdl        application/ssdl+xml                                                      base64
+ssml        application/ssml+xml                                                      base64
+tei         application/tei+xml                                                       base64
+tfi         application/thraud+xml                                                    base64
+tsd         application/timestamped-data                                              base64
+pwn         application/vnd.3M.Post-it-Notes                                          base64
+plb         application/vnd.3gpp.pic-bw-large                                         base64
+psb         application/vnd.3gpp.pic-bw-small                                         base64
+pvb         application/vnd.3gpp.pic-bw-var                                           base64
+sms         application/vnd.3gpp.sms                                                  base64
+tcap        application/vnd.3gpp2.tcap                                                base64
+gph         application/vnd.FloGraphIt                                                base64
+zmm         application/vnd.HandHeld-Entertainment+xml                                base64
+kne         application/vnd.Kinar                                                     base64
+mwf         application/vnd.MFER                                                      base64
+daf         application/vnd.Mobius.DAF                                                base64
+dis         application/vnd.Mobius.DIS                                                base64
+mbk         application/vnd.Mobius.MBK                                                base64
+mqy         application/vnd.Mobius.MQY                                                base64
+msl         application/vnd.Mobius.MSL                                                base64
+plc         application/vnd.Mobius.PLC                                                base64
+txf         application/vnd.Mobius.TXF                                                base64
+qxd         application/vnd.Quark.QuarkXPress                                         8bit
+twd         application/vnd.SimTech-MindMapper                                        base64
+aso         application/vnd.accpac.simply.aso                                         base64
+imp         application/vnd.accpac.simply.imp                                         base64
+acu         application/vnd.acucobol                                                  base64
+atc         application/vnd.acucorp                                                   7bit
+air         application/vnd.adobe.air-application-installer-package+zip               base64
+fcdt        application/vnd.adobe.formscentral.fcdt                                   base64
+fxp         application/vnd.adobe.fxp                                                 base64
+xdp         application/vnd.adobe.xdp+xml                                             base64
+xfdf        application/vnd.adobe.xfdf                                                base64
+ahead       application/vnd.ahead.space                                               base64
+azf         application/vnd.airzip.filesecure.azf                                     base64
+azs         application/vnd.airzip.filesecure.azs                                     base64
+azw         application/vnd.amazon.ebook                                              base64
+acc         application/vnd.americandynamics.acc                                      base64
+ami         application/vnd.amiga.ami                                                 base64
+apk         application/vnd.android.package-archive                                   base64
+cii         application/vnd.anser-web-certificate-issue-initiation                    base64
+fti         application/vnd.anser-web-funds-transfer-initiation                       base64
+atx         application/vnd.antix.game-component                                      base64
+mpkg        application/vnd.apple.installer+xml                                       base64
+m3u8        application/vnd.apple.mpegurl                                             base64
+pkpass      application/vnd.apple.pkpass                                              base64
+swi         application/vnd.aristanetworks.swi                                        base64
+iota        application/vnd.astraea-software.iota                                     base64
+aep         application/vnd.audiograph                                                base64
+mpm         application/vnd.blueice.multipass                                         base64
+bmi         application/vnd.bmi                                                       base64
+rep         application/vnd.businessobjects                                           base64
+cdxml       application/vnd.chemdraw+xml                                              base64
+mmd         application/vnd.chipnuts.karaoke-mmd                                      base64
+cdy         application/vnd.cinderella                                                base64
+cla         application/vnd.claymore                                                  base64
+rp9         application/vnd.cloanto.rp9                                               base64
+c4d         application/vnd.clonk.c4group                                             base64
+c11amc      application/vnd.cluetrust.cartomobile-config                              base64
+c11amz      application/vnd.cluetrust.cartomobile-config-pkg                          base64
+csp         application/vnd.commonspace                                               base64
+cdbcmsg     application/vnd.contact.cmsg                                              base64
+cmc         application/vnd.cosmocaller                                               base64
+clkx        application/vnd.crick.clicker                                             base64
+clkk        application/vnd.crick.clicker.keyboard                                    base64
+clkp        application/vnd.crick.clicker.palette                                     base64
+clkt        application/vnd.crick.clicker.template                                    base64
+clkw        application/vnd.crick.clicker.wordbank                                    base64
+wbs         application/vnd.criticaltools.wbs+xml                                     base64
+pml         application/vnd.ctc-posml                                                 base64
+ppd         application/vnd.cups-ppd                                                  base64
+curl        application/vnd.curl                                                      base64
+car         application/vnd.curl.car                                                  base64
+pcurl       application/vnd.curl.pcurl                                                base64
+dart        application/vnd.dart                                                      base64
+rdz         application/vnd.data-vision.rdz                                           base64
+uvd         application/vnd.dece.data                                                 base64
+uvt         application/vnd.dece.ttml+xml                                             base64
+uvvx        application/vnd.dece.unspecified                                          base64
+uvvz        application/vnd.dece.zip                                                  base64
+fe_launch   application/vnd.denovo.fcselayout-link                                    base64
+dna         application/vnd.dna                                                       base64
+mlp         application/vnd.dolby.mlp                                                 base64
+dpg         application/vnd.dpgraph                                                   base64
+dfac        application/vnd.dreamfactory                                              base64
+kpxx        application/vnd.ds-keypoint                                               base64
+ait         application/vnd.dvb.ait                                                   base64
+svc         application/vnd.dvb.service                                               base64
+geo         application/vnd.dynageo                                                   base64
+mag         application/vnd.ecowin.chart                                              base64
+nml         application/vnd.enliven                                                   base64
+esf         application/vnd.epson.esf                                                 base64
+msf         application/vnd.epson.msf                                                 base64
+qam         application/vnd.epson.quickanime                                          base64
+slt         application/vnd.epson.salt                                                base64
+ssf         application/vnd.epson.ssf                                                 base64
+es3         application/vnd.eszigno3+xml                                              base64
+ez2         application/vnd.ezpix-album                                               base64
+ez3         application/vnd.ezpix-package                                             base64
+fdf         application/vnd.fdf                                                       base64
+mseed       application/vnd.fdsn.mseed                                                base64
+dataless    application/vnd.fdsn.seed                                                 base64
+ftc         application/vnd.fluxtime.clip                                             base64
+frm         application/vnd.framemaker                                                base64
+fnc         application/vnd.frogans.fnc                                               base64
+ltf         application/vnd.frogans.ltf                                               base64
+fsc         application/vnd.fsc.weblaunch                                             7bit
+oas         application/vnd.fujitsu.oasys                                             base64
+oa2         application/vnd.fujitsu.oasys2                                            base64
+oa3         application/vnd.fujitsu.oasys3                                            base64
+fg5         application/vnd.fujitsu.oasysgp                                           base64
+bh2         application/vnd.fujitsu.oasysprs                                          base64
+ddd         application/vnd.fujixerox.ddd                                             base64
+xdw         application/vnd.fujixerox.docuworks                                       base64
+xbd         application/vnd.fujixerox.docuworks.binder                                base64
+fzs         application/vnd.fuzzysheet                                                base64
+txd         application/vnd.genomatix.tuxedo                                          base64
+ggb         application/vnd.geogebra.file                                             base64
+ggt         application/vnd.geogebra.tool                                             base64
+gex         application/vnd.geometry-explorer                                         base64
+gxt         application/vnd.geonext                                                   base64
+g2w         application/vnd.geoplan                                                   base64
+g3w         application/vnd.geospace                                                  base64
+gmx         application/vnd.gmx                                                       base64
+kml         application/vnd.google-earth.kml+xml                                      8bit
+kmz         application/vnd.google-earth.kmz                                          8bit
+gqf         application/vnd.grafeq                                                    base64
+gac         application/vnd.groove-account                                            base64
+ghf         application/vnd.groove-help                                               base64
+gim         application/vnd.groove-identity-message                                   base64
+grv         application/vnd.groove-injector                                           base64
+gtm         application/vnd.groove-tool-message                                       base64
+tpl         application/vnd.groove-tool-template                                      base64
+vcg         application/vnd.groove-vcard                                              base64
+hal         application/vnd.hal+xml                                                   base64
+hbci        application/vnd.hbci                                                      base64
+les         application/vnd.hhe.lesson-player                                         base64
+plt         application/vnd.hp-HPGL                                                   base64
+pcl         application/vnd.hp-PCL                                                    base64
+pclxl       application/vnd.hp-PCLXL                                                  base64
+hpid        application/vnd.hp-hpid                                                   base64
+hps         application/vnd.hp-hps                                                    base64
+jlt         application/vnd.hp-jlyt                                                   base64
+sfd-hdstx   application/vnd.hydrostatix.sof-data                                      base64
+mpy         application/vnd.ibm.MiniPay                                               base64
+emm         application/vnd.ibm.electronic-media                                      base64
+afp         application/vnd.ibm.modcap                                                base64
+irm         application/vnd.ibm.rights-management                                     base64
+sc          application/vnd.ibm.secure-container                                      base64
+icc         application/vnd.iccprofile                                                base64
+igl         application/vnd.igloader                                                  base64
+ivp         application/vnd.immervision-ivp                                           base64
+ivu         application/vnd.immervision-ivu                                           base64
+igm         application/vnd.insors.igm                                                base64
+xpw         application/vnd.intercon.formnet                                          base64
+i2g         application/vnd.intergeo                                                  base64
+qbo         application/vnd.intu.qbo                                                  base64
+qfx         application/vnd.intu.qfx                                                  base64
+rcprofile   application/vnd.ipunplugged.rcprofile                                     base64
+irp         application/vnd.irepository.package+xml                                   base64
+xpr         application/vnd.is-xpr                                                    base64
+fcs         application/vnd.isac.fcs                                                  base64
+jam         application/vnd.jam                                                       base64
+rms         application/vnd.jcp.javame.midlet-rms                                     base64
+jisp        application/vnd.jisp                                                      base64
+joda        application/vnd.joost.joda-archive                                        base64
+ktr         application/vnd.kahootz                                                   base64
+karbon      application/vnd.kde.karbon                                                base64
+chrt        application/vnd.kde.kchart                                                base64
+kfo         application/vnd.kde.kformula                                              base64
+flw         application/vnd.kde.kivio                                                 base64
+kon         application/vnd.kde.kontour                                               base64
+kpr         application/vnd.kde.kpresenter                                            base64
+ksp         application/vnd.kde.kspread                                               base64
+kwd         application/vnd.kde.kword                                                 base64
+htke        application/vnd.kenameaapp                                                base64
+kia         application/vnd.kidspiration                                              base64
+skd         application/vnd.koan                                                      base64
+sse         application/vnd.kodak-descriptor                                          base64
+lasxml      application/vnd.las.las+xml                                               base64
+lbd         application/vnd.llamagraphics.life-balance.desktop                        base64
+lbe         application/vnd.llamagraphics.life-balance.exchange+xml                   base64
+wks         application/vnd.lotus-1-2-3                                               base64
+apr         application/vnd.lotus-approach                                            base64
+pre         application/vnd.lotus-freelance                                           base64
+nsf         application/vnd.lotus-notes                                               base64
+org         application/vnd.lotus-organizer                                           base64
+scm         application/vnd.lotus-screencam                                           base64
+lwp         application/vnd.lotus-wordpro                                             base64
+portpkg     application/vnd.macports.portpkg                                          base64
+mcd         application/vnd.mcd                                                       base64
+mc1         application/vnd.medcalcdata                                               base64
+cdkey       application/vnd.mediastation.cdkey                                        base64
+mfm         application/vnd.mfmp                                                      base64
+flo         application/vnd.micrografx.flo                                            base64
+igx         application/vnd.micrografx.igx                                            base64
+mif         application/vnd.mif                                                       base64
+mpn         application/vnd.mophun.application                                        base64
+mpc         application/vnd.mophun.certificate                                        base64
+xul         application/vnd.mozilla.xul+xml                                           base64
+cil         application/vnd.ms-artgalry                                               base64
+asf         application/vnd.ms-asf                                                    base64
+cab         application/vnd.ms-cab-compressed                                         base64
+xls         application/vnd.ms-excel                                                  base64
+xlam        application/vnd.ms-excel.addin.macroEnabled.12                            base64
+xlsb        application/vnd.ms-excel.sheet.binary.macroEnabled.12                     base64
+xlsm        application/vnd.ms-excel.sheet.macroEnabled.12                            base64
+xltm        application/vnd.ms-excel.template.macroEnabled.12                         base64
+eot         application/vnd.ms-fontobject                                             base64
+chm         application/vnd.ms-htmlhelp                                               base64
+ims         application/vnd.ms-ims                                                    base64
+lrm         application/vnd.ms-lrm                                                    base64
+thmx        application/vnd.ms-officetheme                                            base64
+msg         application/vnd.ms-outlook                                                base64
+cat         application/vnd.ms-pki.seccat                                             base64
+stl         application/vnd.ms-pki.stl                                                base64
+ppt         application/vnd.ms-powerpoint                                             base64
+ppam        application/vnd.ms-powerpoint.addin.macroEnabled.12                       base64
+pptm        application/vnd.ms-powerpoint.presentation.macroEnabled.12                base64
+sldm        application/vnd.ms-powerpoint.slide.macroEnabled.12                       base64
+ppsm        application/vnd.ms-powerpoint.slideshow.macroEnabled.12                   base64
+potm        application/vnd.ms-powerpoint.template.macroEnabled.12                    base64
+mpp         application/vnd.ms-project                                                base64
+docm        application/vnd.ms-word.document.macroEnabled.12                          base64
+dotm        application/vnd.ms-word.template.macroEnabled.12                          base64
+wcm         application/vnd.ms-works                                                  base64
+wpl         application/vnd.ms-wpl                                                    base64
+xps         application/vnd.ms-xpsdocument                                            8bit
+mseq        application/vnd.mseq                                                      base64
+mus         application/vnd.musician                                                  base64
+msty        application/vnd.muvee.style                                               base64
+taglet      application/vnd.mynfc                                                     base64
+ent         application/vnd.nervana                                                   base64
+nlu         application/vnd.neurolanguage.nlu                                         base64
+nitf        application/vnd.nitf                                                      base64
+nnd         application/vnd.noblenet-directory                                        base64
+nns         application/vnd.noblenet-sealer                                           base64
+nnw         application/vnd.noblenet-web                                              base64
+ngdat       application/vnd.nokia.n-gage.data                                         base64
+n-gage      application/vnd.nokia.n-gage.symbian.install                              base64
+rpst        application/vnd.nokia.radio-preset                                        base64
+rpss        application/vnd.nokia.radio-presets                                       base64
+edm         application/vnd.novadigm.EDM                                              base64
+edx         application/vnd.novadigm.EDX                                              base64
+ext         application/vnd.novadigm.EXT                                              base64
+odc         application/vnd.oasis.opendocument.chart                                  base64
+odc         application/vnd.oasis.opendocument.chart-template                         base64
+odb         application/vnd.oasis.opendocument.database                               base64
+odf         application/vnd.oasis.opendocument.formula                                base64
+odf         application/vnd.oasis.opendocument.formula-template                       base64
+odg         application/vnd.oasis.opendocument.graphics                               base64
+otg         application/vnd.oasis.opendocument.graphics-template                      base64
+odi         application/vnd.oasis.opendocument.image                                  base64
+odi         application/vnd.oasis.opendocument.image-template                         base64
+odp         application/vnd.oasis.opendocument.presentation                           base64
+otp         application/vnd.oasis.opendocument.presentation-template                  base64
+ods         application/vnd.oasis.opendocument.spreadsheet                            base64
+ots         application/vnd.oasis.opendocument.spreadsheet-template                   base64
+odt         application/vnd.oasis.opendocument.text                                   base64
+odm         application/vnd.oasis.opendocument.text-master                            base64
+ott         application/vnd.oasis.opendocument.text-template                          base64
+oth         application/vnd.oasis.opendocument.text-web                               base64
+xo          application/vnd.olpc-sugar                                                base64
+dd2         application/vnd.oma.dd2+xml                                               base64
+oxt         application/vnd.openofficeorg.extension                                   base64
+pptx        application/vnd.openxmlformats-officedocument.presentationml.presentation base64
+sldx        application/vnd.openxmlformats-officedocument.presentationml.slide        base64
+ppsx        application/vnd.openxmlformats-officedocument.presentationml.slideshow    base64
+potx        application/vnd.openxmlformats-officedocument.presentationml.template     base64
+xlsx        application/vnd.openxmlformats-officedocument.spreadsheetml.sheet         base64
+xltx        application/vnd.openxmlformats-officedocument.spreadsheetml.template      base64
+docx        application/vnd.openxmlformats-officedocument.wordprocessingml.document   base64
+dotx        application/vnd.openxmlformats-officedocument.wordprocessingml.template   base64
+mgp         application/vnd.osgeo.mapguide.package                                    base64
+dp          application/vnd.osgi.dp                                                   base64
+esa         application/vnd.osgi.subsystem                                            base64
+prc         application/vnd.palm                                                      base64
+paw         application/vnd.pawaafile                                                 base64
+str         application/vnd.pg.format                                                 base64
+ei6         application/vnd.pg.osasli                                                 base64
+efif        application/vnd.picsel                                                    base64
+wg          application/vnd.pmi.widget                                                base64
+plf         application/vnd.pocketlearn                                               base64
+pbd         application/vnd.powerbuilder6                                             base64
+box         application/vnd.previewsystems.box                                        base64
+mgz         application/vnd.proteus.magazine                                          base64
+qps         application/vnd.publishare-delta-tree                                     base64
+pti         application/vnd.pvi.ptid1                                                 base64
+bed         application/vnd.realvnc.bed                                               base64
+mxl         application/vnd.recordare.musicxml                                        base64
+musicxml    application/vnd.recordare.musicxml+xml                                    base64
+cryptonote  application/vnd.rig.cryptonote                                            base64
+cod         application/vnd.rim.cod                                                   base64
+rm          application/vnd.rn-realmedia                                              base64
+rmvb        application/vnd.rn-realmedia-vbr                                          base64
+link66      application/vnd.route66.link66+xml                                        base64
+st          application/vnd.sailingtracker.track                                      base64
+sdoc        application/vnd.sealed.doc                                                base64
+seml        application/vnd.sealed.eml                                                base64
+smht        application/vnd.sealed.mht                                                base64
+sppt        application/vnd.sealed.ppt                                                base64
+sxls        application/vnd.sealed.xls                                                base64
+stml        application/vnd.sealedmedia.softseal.html                                 base64
+spdf        application/vnd.sealedmedia.softseal.pdf                                  base64
+see         application/vnd.seemail                                                   base64
+sema        application/vnd.sema                                                      base64
+semd        application/vnd.semd                                                      base64
+semf        application/vnd.semf                                                      base64
+ifm         application/vnd.shana.informed.formdata                                   base64
+itp         application/vnd.shana.informed.formtemplate                               base64
+iif         application/vnd.shana.informed.interchange                                base64
+ipk         application/vnd.shana.informed.package                                    base64
+mmf         application/vnd.smaf                                                      base64
+teacher     application/vnd.smart.teacher                                             base64
+sdkd        application/vnd.solent.sdkm+xml                                           base64
+dxp         application/vnd.spotfire.dxp                                              base64
+sfs         application/vnd.spotfire.sfs                                              base64
+sdc         application/vnd.stardivision.calc                                         base64
+sds         application/vnd.stardivision.chart                                        base64
+sda         application/vnd.stardivision.draw                                         base64
+sdd         application/vnd.stardivision.impress                                      base64
+sdf         application/vnd.stardivision.math                                         base64
+sdw         application/vnd.stardivision.writer                                       base64
+sgl         application/vnd.stardivision.writer-global                                base64
+smzip       application/vnd.stepmania.package                                         base64
+sm          application/vnd.stepmania.stepchart                                       base64
+sxc         application/vnd.sun.xml.calc                                              base64
+stc         application/vnd.sun.xml.calc.template                                     base64
+sxd         application/vnd.sun.xml.draw                                              base64
+std         application/vnd.sun.xml.draw.template                                     base64
+sxi         application/vnd.sun.xml.impress                                           base64
+sti         application/vnd.sun.xml.impress.template                                  base64
+sxm         application/vnd.sun.xml.math                                              base64
+sxw         application/vnd.sun.xml.writer                                            base64
+sxg         application/vnd.sun.xml.writer.global                                     base64
+stw         application/vnd.sun.xml.writer.template                                   base64
+sus         application/vnd.sus-calendar                                              base64
+svd         application/vnd.svd                                                       base64
+sis         application/vnd.symbian.install                                           base64
+xsm         application/vnd.syncml+xml                                                base64
+bdm         application/vnd.syncml.dm+wbxml                                           base64
+xdm         application/vnd.syncml.dm+xml                                             base64
+tao         application/vnd.tao.intent-module-archive                                 base64
+cap         application/vnd.tcpdump.pcap                                              base64
+tmo         application/vnd.tmobile-livetv                                            base64
+tpt         application/vnd.trid.tpt                                                  base64
+mxs         application/vnd.triscape.mxs                                              base64
+tra         application/vnd.trueapp                                                   base64
+ufd         application/vnd.ufdl                                                      base64
+utz         application/vnd.uiq.theme                                                 base64
+umj         application/vnd.umajin                                                    base64
+unityweb    application/vnd.unity                                                     base64
+uoml        application/vnd.uoml+xml                                                  base64
+vcx         application/vnd.vcx                                                       base64
+vsc         application/vnd.vidsoft.vidconference                                     8bit
+vsd         application/vnd.visio                                                     base64
+vis         application/vnd.visionary                                                 base64
+vsf         application/vnd.vsf                                                       base64
+sic         application/vnd.wap.sic                                                   base64
+slc         application/vnd.wap.slc                                                   base64
+wbxml       application/vnd.wap.wbxml                                                 base64
+wmlc        application/vnd.wap.wmlc                                                  base64
+wmlsc       application/vnd.wap.wmlscriptc                                            base64
+wtb         application/vnd.webturbo                                                  base64
+nbp         application/vnd.wolfram.player                                            base64
+wpd         application/vnd.wordperfect                                               base64
+wqd         application/vnd.wqd                                                       base64
+stf         application/vnd.wt.stf                                                    base64
+wv          application/vnd.wv.csp+wbxml                                              base64
+xar         application/vnd.xara                                                      base64
+xfdl        application/vnd.xfdl                                                      base64
+hvd         application/vnd.yamaha.hv-dic                                             base64
+hvs         application/vnd.yamaha.hv-script                                          base64
+hvp         application/vnd.yamaha.hv-voice                                           base64
+osf         application/vnd.yamaha.openscoreformat                                    base64
+osfpvg      application/vnd.yamaha.openscoreformat.osfpvg+xml                         base64
+saf         application/vnd.yamaha.smaf-audio                                         base64
+spf         application/vnd.yamaha.smaf-phrase                                        base64
+cmp         application/vnd.yellowriver-custom-menu                                   base64
+zir         application/vnd.zul                                                       base64
+zaz         application/vnd.zzazz.deck+xml                                            base64
+vxml        application/voicexml+xml                                                  base64
+wasm        application/wasm                                                          8bit
+wif         application/watcherinfo+xml                                               base64
+wgt         application/widget                                                        base64
+wp5         application/wordperfect5.1                                                base64
+wsdl        application/wsdl+xml                                                      base64
+wspolicy    application/wspolicy+xml                                                  base64
+wk          application/x-123                                                         base64
+7z          application/x-7z-compressed                                               base64
+bck         application/x-VMSBACKUP                                                   base64
+wz          application/x-Wingz                                                       base64
+abw         application/x-abiword                                                     base64
+ace         application/x-ace-compressed                                              base64
+dmg         application/x-apple-diskimage                                             base64
+aab         application/x-authorware-bin                                              base64
+aam         application/x-authorware-map                                              base64
+aas         application/x-authorware-seg                                              base64
+bcpio       application/x-bcpio                                                       base64
+torrent     application/x-bittorrent                                                  base64
+bleep       application/x-bleeper                                                     base64
+blb         application/x-blorb                                                       base64
+bz          application/x-bzip                                                        base64
+boz         application/x-bzip2                                                       base64
+cb7         application/x-cbr                                                         base64
+vcd         application/x-cdlink                                                      base64
+cfs         application/x-cfs-compressed                                              base64
+chat        application/x-chat                                                        base64
+pgn         application/x-chess-pgn                                                   base64
+crx         application/x-chrome-extension                                            base64
+z           application/x-compressed                                                  base64
+nsc         application/x-conference                                                  base64
+cpio        application/x-cpio                                                        base64
+csh         application/x-csh                                                         8bit
+csm         application/x-cu-seeme                                                    base64
+deb         application/x-debian-package                                              base64
+dgc         application/x-dgc-compressed                                              base64
+dcr         application/x-director                                                    base64
+wad         application/x-doom                                                        base64
+ncx         application/x-dtbncx+xml                                                  base64
+dtb         application/x-dtbook+xml                                                  base64
+res         application/x-dtbresource+xml                                             base64
+dvi         application/x-dvi                                                         base64
+evy         application/x-envoy                                                       base64
+eva         application/x-eva                                                         base64
+bdf         application/x-font-bdf                                                    base64
+gsf         application/x-font-ghostscript                                            base64
+psf         application/x-font-linux-psf                                              base64
+pcf         application/x-font-pcf                                                    base64
+snf         application/x-font-snf                                                    base64
+afm         application/x-font-type1                                                  base64
+arc         application/x-freearc                                                     base64
+spl         application/x-futuresplash                                                base64
+gca         application/x-gca-compressed                                              base64
+ulx         application/x-glulx                                                       base64
+gnumeric    application/x-gnumeric                                                    base64
+gramps      application/x-gramps-xml                                                  base64
+gtar        application/x-gtar                                                        base64
+hdf         application/x-hdf                                                         base64
+hep         application/x-hep                                                         base64
+rhtml       application/x-html+ruby                                                   8bit
+phtml       application/x-httpd-php                                                   8bit
+ibooks      application/x-ibooks+zip                                                  base64
+ica         application/x-ica                                                         base64
+imagemap    application/x-imagemap                                                    8bit
+install     application/x-install-instructions                                        base64
+iso         application/x-iso9660-image                                               base64
+key         application/x-iwork-keynote-sffkey                                        base64
+numbers     application/x-iwork-numbers-sffnumbers                                    base64
+pages       application/x-iwork-pages-sffpages                                        base64
+jnlp        application/x-java-jnlp-file                                              base64
+ltx         application/x-latex                                                       8bit
+cpt         application/x-mac-compactpro                                              base64
+mie         application/x-mie                                                         base64
+mobi        application/x-mobipocket-ebook                                            base64
+application application/x-ms-application                                              base64
+exe         application/x-ms-dos-executable                                           base64
+lnk         application/x-ms-shortcut                                                 base64
+wmd         application/x-ms-wmd                                                      base64
+wmz         application/x-ms-wmz                                                      base64
+xbap        application/x-ms-xbap                                                     base64
+mda         application/x-msaccess                                                    base64
+obd         application/x-msbinder                                                    base64
+crd         application/x-mscardfile                                                  base64
+clp         application/x-msclip                                                      base64
+cmd         application/x-msdos-program                                               base64
+exe         application/x-msdownload                                                  base64
+m13         application/x-msmediaview                                                 base64
+emf         application/x-msmetafile                                                  base64
+mny         application/x-msmoney                                                     base64
+pub         application/x-mspublisher                                                 base64
+scd         application/x-msschedule                                                  base64
+trm         application/x-msterminal                                                  base64
+wri         application/x-mswrite                                                     base64
+pac         application/x-ns-proxy-autoconfig                                         base64
+nzb         application/x-nzb                                                         base64
+oex         application/x-opera-extension                                             base64
+pm          application/x-pagemaker                                                   base64
+pl          application/x-perl                                                        8bit
+p12         application/x-pkcs12                                                      base64
+p7b         application/x-pkcs7-certificates                                          base64
+p7r         application/x-pkcs7-certreqresp                                           base64
+py          application/x-python                                                      8bit
+qtl         application/x-quicktimeplayer                                             base64
+rar         application/x-rar-compressed                                              base64
+ris         application/x-research-info-systems                                       base64
+rb          application/x-ruby                                                        8bit
+sh          application/x-sh                                                          8bit
+shar        application/x-shar                                                        8bit
+swf         application/x-shockwave-flash                                             base64
+xap         application/x-silverlight-app                                             base64
+notebook    application/x-smarttech-notebook                                          base64
+sav         application/x-spss                                                        base64
+sql         application/x-sql                                                         base64
+sit         application/x-stuffit                                                     base64
+sitx        application/x-stuffitx                                                    base64
+srt         application/x-subrip                                                      base64
+sv4cpio     application/x-sv4cpio                                                     base64
+sv4crc      application/x-sv4crc                                                      base64
+t3          application/x-t3vm-image                                                  base64
+gam         application/x-tads                                                        base64
+tar         application/x-tar                                                         base64
+tcl         application/x-tcl                                                         8bit
+tex         application/x-tex                                                         8bit
+tfm         application/x-tex-tfm                                                     base64
+texinfo     application/x-texinfo                                                     8bit
+obj         application/x-tgif                                                        base64
+tbk         application/x-toolbook                                                    base64
+ustar       application/x-ustar                                                       base64
+src         application/x-wais-source                                                 base64
+webapp      application/x-web-app-manifest+json                                       base64
+wp6         application/x-wordperfect6.1                                              base64
+crt         application/x-x509-ca-cert                                                base64
+fig         application/x-xfig                                                        base64
+xlf         application/x-xliff+xml                                                   base64
+xpi         application/x-xpinstall                                                   base64
+xz          application/x-xz                                                          base64
+z1          application/x-zmachine                                                    base64
+xaml        application/xaml+xml                                                      base64
+xdf         application/xcap-diff+xml                                                 base64
+xenc        application/xenc+xml                                                      base64
+xht         application/xhtml+xml                                                     8bit
+xml         application/xml                                                           8bit
+dtd         application/xml-dtd                                                       8bit
+xop         application/xop+xml                                                       base64
+xpl         application/xproc+xml                                                     base64
+xslt        application/xslt+xml                                                      base64
+xspf        application/xspf+xml                                                      base64
+mxml        application/xv+xml                                                        base64
+yang        application/yang                                                          base64
+yin         application/yin+xml                                                       base64
+zip         application/zip                                                           base64
+amr         audio/AMR                                                                 base64
+awb         audio/AMR-WB                                                              base64
+evc         audio/EVRC                                                                base64
+l16         audio/L16                                                                 base64
+smv         audio/SMV                                                                 base64
+adp         audio/adpcm                                                               base64
+au          audio/basic                                                               base64
+kar         audio/midi                                                                base64
+mp4         audio/mp4                                                                 base64
+mpga        audio/mpeg                                                                base64
+oga         audio/ogg                                                                 base64
+s3m         audio/s3m                                                                 base64
+sil         audio/silk                                                                base64
+uva         audio/vnd.dece.audio                                                      base64
+eol         audio/vnd.digital-winds                                                   7bit
+dra         audio/vnd.dra                                                             base64
+dts         audio/vnd.dts                                                             base64
+dtshd       audio/vnd.dts.hd                                                          base64
+plj         audio/vnd.everad.plj                                                      base64
+lvp         audio/vnd.lucent.voice                                                    base64
+pya         audio/vnd.ms-playready.media.pya                                          base64
+mxmf        audio/vnd.nokia.mobile-xmf                                                base64
+vbk         audio/vnd.nortel.vbk                                                      base64
+ecelp4800   audio/vnd.nuera.ecelp4800                                                 base64
+ecelp7470   audio/vnd.nuera.ecelp7470                                                 base64
+ecelp9600   audio/vnd.nuera.ecelp9600                                                 base64
+qcp         audio/vnd.qcelp                                                           base64
+rip         audio/vnd.rip                                                             base64
+smp3        audio/vnd.sealedmedia.softseal.mpeg                                       base64
+wav         audio/wav                                                                 base64
+weba        audio/webm                                                                base64
+aac         audio/x-aac                                                               base64
+aif         audio/x-aiff                                                              base64
+caf         audio/x-caf                                                               base64
+flac        audio/x-flac                                                              base64
+mka         audio/x-matroska                                                          base64
+m3u         audio/x-mpegurl                                                           base64
+wax         audio/x-ms-wax                                                            base64
+wma         audio/x-ms-wma                                                            base64
+wmv         audio/x-ms-wmv                                                            base64
+ra          audio/x-pn-realaudio                                                      base64
+rmp         audio/x-pn-realaudio-plugin                                               base64
+xm          audio/xm                                                                  base64
+cdx         chemical/x-cdx                                                            base64
+cif         chemical/x-cif                                                            base64
+cmdf        chemical/x-cmdf                                                           base64
+cml         chemical/x-cml                                                            base64
+csml        chemical/x-csml                                                           base64
+ttc         font/collection                                                           base64
+otf         font/otf                                                                  base64
+ttf         font/ttf                                                                  base64
+woff        font/woff                                                                 base64
+woff2       font/woff2                                                                base64
+avif        image/avif                                                                base64
+bmp         image/bmp                                                                 base64
+cgm         image/cgm                                                                 base64
+g3          image/g3fax                                                               base64
+gif         image/gif                                                                 base64
+heic        image/heic                                                                base64
+heics       image/heic-sequence                                                       base64
+heif        image/heif                                                                base64
+heifs       image/heif-sequence                                                       base64
+ief         image/ief                                                                 base64
+jp2         image/jp2                                                                 base64
+jpeg        image/jpeg                                                                base64
+jpm         image/jpm                                                                 base64
+jpx         image/jpx                                                                 base64
+ktx         image/ktx                                                                 base64
+png         image/png                                                                 base64
+btif        image/prs.btif                                                            base64
+sgi         image/sgi                                                                 base64
+svg         image/svg+xml                                                             8bit
+tiff        image/tiff                                                                base64
+psd         image/vnd.adobe.photoshop                                                 base64
+uvg         image/vnd.dece.graphic                                                    base64
+djvu        image/vnd.djvu                                                            base64
+sub         image/vnd.dvb.subtitle                                                    base64
+dwg         image/vnd.dwg                                                             base64
+dxf         image/vnd.dxf                                                             base64
+fbs         image/vnd.fastbidsheet                                                    base64
+fpx         image/vnd.fpx                                                             base64
+fst         image/vnd.fst                                                             base64
+mmr         image/vnd.fujixerox.edmics-mmr                                            base64
+rlc         image/vnd.fujixerox.edmics-rlc                                            base64
+pgb         image/vnd.globalgraphics.pgb                                              base64
+ico         image/vnd.microsoft.icon                                                  base64
+mdi         image/vnd.ms-modi                                                         base64
+wdp         image/vnd.ms-photo                                                        base64
+npx         image/vnd.net-fpx                                                         base64
+wbmp        image/vnd.wap.wbmp                                                        base64
+xif         image/vnd.xiff                                                            base64
+webp        image/webp                                                                base64
+3ds         image/x-3ds                                                               base64
+dng         image/x-adobe-dng                                                         base64
+cr2         image/x-canon-cr2                                                         base64
+crw         image/x-canon-crw                                                         base64
+ras         image/x-cmu-raster                                                        base64
+cmx         image/x-cmx                                                               base64
+xcfbz2      image/x-compressed-xcf                                                    base64
+erf         image/x-epson-erf                                                         base64
+fh          image/x-freehand                                                          base64
+raf         image/x-fuji-raf                                                          base64
+3fr         image/x-hasselblad-3fr                                                    base64
+k25         image/x-kodak-k25                                                         base64
+kdc         image/x-kodak-kdc                                                         base64
+mrw         image/x-minolta-mrw                                                       base64
+sid         image/x-mrsid-image                                                       base64
+nef         image/x-nikon-nef                                                         base64
+orf         image/x-olympus-orf                                                       base64
+psp         image/x-paintshoppro                                                      base64
+raw         image/x-panasonic-raw                                                     base64
+pcx         image/x-pcx                                                               base64
+pef         image/x-pentax-pef                                                        base64
+pct         image/x-pict                                                              base64
+pnm         image/x-portable-anymap                                                   base64
+pbm         image/x-portable-bitmap                                                   base64
+pgm         image/x-portable-graymap                                                  base64
+ppm         image/x-portable-pixmap                                                   base64
+rgb         image/x-rgb                                                               base64
+x3f         image/x-sigma-x3f                                                         base64
+arw         image/x-sony-arw                                                          base64
+sr2         image/x-sony-sr2                                                          base64
+srf         image/x-sony-srf                                                          base64
+tga         image/x-targa                                                             base64
+dgn         image/x-vnd.dgn                                                           base64
+xbm         image/x-xbitmap                                                           7bit
+xcf         image/x-xcf                                                               base64
+xpm         image/x-xpixmap                                                           8bit
+xwd         image/x-xwindowdump                                                       base64
+eml         message/rfc822                                                            8bit
+igs         model/iges                                                                base64
+msh         model/mesh                                                                base64
+dae         model/vnd.collada+xml                                                     base64
+dwf         model/vnd.dwf                                                             base64
+gdl         model/vnd.gdl                                                             base64
+gtw         model/vnd.gtw                                                             base64
+mts         model/vnd.mts                                                             base64
+x_b         model/vnd.parasolid.transmit.binary                                       base64
+x_t         model/vnd.parasolid.transmit.text                                         quoted-printable
+vtu         model/vnd.vtu                                                             base64
+wrl         model/vrml                                                                base64
+x3db        model/x3d+binary                                                          base64
+x3dv        model/x3d+vrml                                                            base64
+x3d         model/x3d+xml                                                             base64
+appcache    text/cache-manifest                                                       quoted-printable
+ics         text/calendar                                                             quoted-printable
+css         text/css                                                                  8bit
+csv         text/csv                                                                  8bit
+html        text/html                                                                 8bit
+markdown    text/markdown                                                             quoted-printable
+n3          text/n3                                                                   quoted-printable
+txt         text/plain                                                                quoted-printable
+dsc         text/prs.lines.tag                                                        quoted-printable
+rtx         text/richtext                                                             8bit
+sgml        text/sgml                                                                 quoted-printable
+tsv         text/tab-separated-values                                                 quoted-printable
+t           text/troff                                                                8bit
+ttl         text/turtle                                                               quoted-printable
+uri         text/uri-list                                                             quoted-printable
+vcard       text/vcard                                                                quoted-printable
+dcurl       text/vnd.curl.dcurl                                                       quoted-printable
+mcurl       text/vnd.curl.mcurl                                                       quoted-printable
+scurl       text/vnd.curl.scurl                                                       quoted-printable
+fly         text/vnd.fly                                                              quoted-printable
+flx         text/vnd.fmi.flexstor                                                     quoted-printable
+gv          text/vnd.graphviz                                                         quoted-printable
+3dml        text/vnd.in3d.3dml                                                        quoted-printable
+spot        text/vnd.in3d.spot                                                        quoted-printable
+ccc         text/vnd.net2phone.commcenter.command                                     quoted-printable
+jad         text/vnd.sun.j2me.app-descriptor                                          8bit
+si          text/vnd.wap.si                                                           quoted-printable
+sl          text/vnd.wap.sl                                                           quoted-printable
+wml         text/vnd.wap.wml                                                          quoted-printable
+wmls        text/vnd.wap.wmlscript                                                    quoted-printable
+vtt         text/vtt                                                                  quoted-printable
+asm         text/x-asm                                                                quoted-printable
+c           text/x-c                                                                  quoted-printable
+coffee      text/x-coffescript                                                        8bit
+htc         text/x-component                                                          8bit
+f           text/x-fortran                                                            quoted-printable
+java        text/x-java-source                                                        quoted-printable
+nfo         text/x-nfo                                                                quoted-printable
+opml        text/x-opml                                                               quoted-printable
+p           text/x-pascal                                                             quoted-printable
+etx         text/x-setext                                                             quoted-printable
+sfv         text/x-sfv                                                                quoted-printable
+uu          text/x-uuencode                                                           quoted-printable
+vcs         text/x-vcalendar                                                          8bit
+vcf         text/x-vcard                                                              8bit
+yaml        text/x-yaml                                                               8bit
+xml         text/xml                                                                  8bit
+3gp         video/3gpp                                                                base64
+3g2         video/3gpp2                                                               base64
+dv          video/DV                                                                  base64
+h261        video/H261                                                                base64
+h263        video/H263                                                                base64
+h264        video/H264                                                                base64
+jpgv        video/JPEG                                                                base64
+mj2         video/MJ2                                                                 base64
+ts          video/MP2T                                                                base64
+mp4         video/mp4                                                                 base64
+mp2         video/mpeg                                                                base64
+ogg         video/ogg                                                                 base64
+qt          video/quicktime                                                           base64
+uvh         video/vnd.dece.hd                                                         base64
+uvm         video/vnd.dece.mobile                                                     base64
+uvp         video/vnd.dece.pd                                                         base64
+uvs         video/vnd.dece.sd                                                         base64
+uvv         video/vnd.dece.video                                                      base64
+dvb         video/vnd.dvb.file                                                        base64
+fvt         video/vnd.fvt                                                             base64
+mxu         video/vnd.mpegurl                                                         8bit
+pyv         video/vnd.ms-playready.media.pyv                                          base64
+nim         video/vnd.nokia.interleaved-multimedia                                    base64
+mp4         video/vnd.objectvideo                                                     base64
+s11         video/vnd.sealed.mpeg1                                                    base64
+smpg        video/vnd.sealed.mpeg4                                                    base64
+sswf        video/vnd.sealed.swf                                                      base64
+smov        video/vnd.sealedmedia.softseal.mov                                        base64
+uvu         video/vnd.uvvu.mp4                                                        base64
+viv         video/vnd.vivo                                                            base64
+dl          video/x-dl                                                                base64
+fli         video/x-fli                                                               base64
+flv         video/x-flv                                                               base64
+gl          video/x-gl                                                                base64
+ivf         video/x-ivf                                                               base64
+mk3d        video/x-matroska                                                          base64
+mng         video/x-mng                                                               base64
+mjpg        video/x-motion-jpeg                                                       base64
+asf         video/x-ms-asf                                                            base64
+vob         video/x-ms-vob                                                            base64
+wm          video/x-ms-wm                                                             base64
+wmx         video/x-ms-wmx                                                            base64
+wvx         video/x-ms-wvx                                                            base64
+avi         video/x-msvideo                                                           base64
+movie       video/x-sgi-movie                                                         base64
+xyz         x-chemical/x-xyz                                                          base64
+ice         x-conference/x-cooltalk                                                   base64
\ No newline at end of file
diff --git a/client/scripts/network.js b/client/scripts/network.js
index eb599014..9c7a1b3f 100644
--- a/client/scripts/network.js
+++ b/client/scripts/network.js
@@ -167,8 +167,11 @@ class Peer {
             case 'progress':
                 this._onDownloadProgress(message.progress);
                 break;
-            case 'transfer-complete':
-                this._onTransferCompleted();
+            case 'file-transfer-complete':
+                this._onFileTransferCompleted();
+                break;
+            case 'message-transfer-complete':
+                this._onMessageTransferCompleted();
                 break;
             case 'text':
                 this._onTextReceived(message);
@@ -204,10 +207,10 @@ class Peer {
 
     _onFileReceived(proxyFile) {
         Events.fire('file-received', proxyFile);
-        this.sendJSON({ type: 'transfer-complete' });
+        this.sendJSON({ type: 'file-transfer-complete' });
     }
 
-    _onTransferCompleted() {
+    _onFileTransferCompleted() {
         this._onDownloadProgress(1);
         this._reader = null;
         this._busy = false;
@@ -215,6 +218,10 @@ class Peer {
         Events.fire('notify-user', 'File transfer completed.');
     }
 
+    _onMessageTransferCompleted() {
+        Events.fire('notify-user', 'Message transfer completed.');
+    }
+
     sendText(text) {
         const unescaped = btoa(unescape(encodeURIComponent(text)));
         this.sendJSON({ type: 'text', text: unescaped });
@@ -223,6 +230,7 @@ class Peer {
     _onTextReceived(message) {
         const escaped = decodeURIComponent(escape(atob(message.text)));
         Events.fire('text-received', { text: escaped, sender: this._peerId });
+        this.sendJSON({ type: 'message-transfer-complete' });
     }
 }
 
@@ -512,6 +520,10 @@ class Events {
     static on(type, callback) {
         return window.addEventListener(type, callback, false);
     }
+
+    static off(type, callback) {
+        window.removeEventListener(type, callback, false);
+    }
 }
 
 
diff --git a/client/scripts/ui.js b/client/scripts/ui.js
index 0c159841..6b03ced7 100644
--- a/client/scripts/ui.js
+++ b/client/scripts/ui.js
@@ -4,6 +4,8 @@ const isURL = text => /^((https?:\/\/|www)[^\s]+)/g.test(text.toLowerCase());
 window.isDownloadSupported = (typeof document.createElement('a').download !== 'undefined');
 window.isProductionEnvironment = !window.location.host.startsWith('localhost');
 window.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+window.pasteMode = {};
+window.pasteMode.activated = false;
 
 // set display name
 Events.on('display-name', e => {
@@ -14,13 +16,13 @@ Events.on('display-name', e => {
 });
 
 class PeersUI {
-
     constructor() {
         Events.on('peer-joined', e => this._onPeerJoined(e.detail));
         Events.on('peer-left', e => this._onPeerLeft(e.detail));
         Events.on('peers', e => this._onPeers(e.detail));
         Events.on('file-progress', e => this._onFileProgress(e.detail));
         Events.on('paste', e => this._onPaste(e));
+        Events.on('activate-paste-mode', e => this._activatePasteMode(() => this._getClipboardData()))
     }
 
     _onPeerJoined(peer) {
@@ -52,19 +54,163 @@ class PeersUI {
         const $peers = $$('x-peers').innerHTML = '';
     }
 
-    _onPaste(e) {
-        const files = e.clipboardData.files || e.clipboardData.items
-            .filter(i => i.type.indexOf('image') > -1)
-            .map(i => i.getAsFile());
-        const peers = document.querySelectorAll('x-peer');
-        // send the pasted image content to the only peer if there is one
-        // otherwise, select the peer somehow by notifying the client that
-        // "image data has been pasted, click the client to which to send it"
-        // not implemented
-        if (files.length > 0 && peers.length === 1) {
+    _getPeers() {
+        let peers = []
+        const peersNodes = document.querySelectorAll('x-peer');
+        peersNodes.forEach(function(peersNode) {
+            peers.push({
+                id: peersNode.id,
+                name: peersNode.name,
+                rtcSupported: peersNode.rtcSupported
+            })
+        });
+        return peers;
+    }
+
+    async _onPaste(e) {
+        const dialogNodes = document.querySelectorAll('x-dialog');
+        let dialogIsOpen = false
+        dialogNodes.forEach(function (dialogNode) {
+            for(let i=0; i<dialogNode.attributes.length; i++){
+                if (dialogNode.attributes[i].name === "show") {
+                    dialogIsOpen = true;
+                    break
+                }
+            }
+        });
+        if(!dialogIsOpen) {
+            // prevent send on paste when dialog is open
+            e.preventDefault()
+            const files = e.clipboardData.files;
+            const text = e.clipboardData.getData("Text");
+            this._activatePasteMode(() => [files, text]);
+        }
+    }
+
+    async _getClipboardData() {
+        let files = [];
+        let text = '';
+        try {
+            let dataTransfer = new DataTransfer();
+            dataTransfer.effectAllowed = "all";
+
+            const clipboardItems = await navigator.clipboard.read();
+            for (const clipboardItem of clipboardItems) {
+                if (clipboardItems.length === 1 && clipboardItem.types.length === 0) {
+                    // On ios Safari somehow clipboardItems of pasted photos have empty types arrays. Abort.
+                    Events.fire('notify-user', 'File not supported. Use paste area.');
+                }
+
+                let typesFiles = clipboardItem.types.filter(i => i.indexOf('text') === -1);
+                if (typesFiles.length > 0) {
+                    // everything except text
+                    let blob = await clipboardItem.getType(typesFiles[0]);
+                    files.push(new File([blob], 'file', {type: typesFiles[0]}));
+                }
+            }
+
+            const typesText = clipboardItems[0].types.filter(i => i.indexOf('text') > -1);
+            if (typesText.length > 0) {
+                // text only
+                const blob = await clipboardItems[0].getType(typesText[0]);
+                text = await blob.text();
+            }
+        } catch (err) {
+            console.error('Failed to read clipboard contents: ', err);
+            if (err.message === 'No valid data on clipboard.') {
+                Events.fire('notify-user', 'File not supported. Use paste area.');
+            } else {
+                console.log('Asynchronous Clipboard API is not implemented yet by some browsers including Firefox.')
+                console.log('Trying readText() function instead')
+                try {
+                    files = [];
+                    text = await navigator.clipboard.readText();
+                } catch (err) {
+                    console.error('Failed to read clipboard contents user readText() function: ', err);
+                    console.log('In Firefox readText() function can be enabled by setting ' +
+                                'dom.events.asyncClipboard.readText in about:config to true')
+                    console.log('Otherwise just paste everything into paste-area')
+                    Events.fire('notify-user', 'Browser not supported. Use paste area!');
+                }
+            }
+        }
+        return [files, text];
+    }
+
+    _activatePasteMode(_callback) {
+        if (!window.pasteMode.activated) {
+            window.pasteMode.activated = true;
+            console.log('Paste mode activated.')
+            this._onPeers(this._getPeers());
+            const xInstructions = document.querySelectorAll('x-instructions')[0];
+            xInstructions.setAttribute('desktop', 'Click to send clipboard content');
+            xInstructions.setAttribute('mobile', 'Tap to send clipboard content');
+            const xPasteArea = document.querySelectorAll('x-paste-area')[0];
+            xPasteArea.getElementsByTagName('span')[0].setAttribute('hidden', "");
+            const xPasteAreaCancelBtn = xPasteArea.getElementsByClassName('button')[0];
+            xPasteAreaCancelBtn.addEventListener('click',
+                () => Events.fire('notify-user', 'Paste Mode canceled'))
+            xPasteAreaCancelBtn.removeAttribute('hidden');
+            this.sendClipboardDataCallback = (e) => this._sendClipboardData(e, _callback);
+            this.deactivatePasteModeCallback = (e) => this._deactivatePasteMode(e);
+            Events.on('paste-pointerdown', this.sendClipboardDataCallback);
+            Events.on('notify-user', this.deactivatePasteModeCallback);
+        }
+    }
+
+    _deactivatePasteMode(e) {
+        if (window.pasteMode.activated &&
+            ['File transfer completed.', 'Message transfer completed.', 'File not supported. Use paste area.',
+            'Browser not supported. Use paste area!', 'Paste Mode canceled'].includes(e.detail)) {
+            window.pasteMode.activated = false;
+            window.pasteMode.textIsDataUri = false;
+            window.pasteMode.filename = "";
+            console.log('Paste mode deactivated.')
+            Events.off('paste-pointerdown', this.sendClipboardDataCallback);
+            Events.off('notify-user', this.deactivatePasteModeCallback);
+            this._onPeers(this._getPeers());
+            const xInstructions = document.querySelectorAll('x-instructions')[0];
+            xInstructions.setAttribute('desktop', 'Click to send files or right click to send a message');
+            xInstructions.setAttribute('mobile', 'Tap to send files or long tap to send a message');
+            const xPasteArea = document.querySelectorAll('x-paste-area')[0];
+            xPasteArea.getElementsByClassName('button')[0].setAttribute('hidden', "");
+            xPasteArea.getElementsByTagName('span')[0].removeAttribute('hidden');
+            //replace url in history to prevent unwanted pasting on reload or back/forward
+            window.history.replaceState({}, "title**", '/');
+        }
+    }
+
+    _dataURLtoFile(data, filename) {
+        let arr = data.split(','), mime = arr[0].match(/:(.*?);/)[1],
+            bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+        while(n--){
+            u8arr[n] = bstr.charCodeAt(n);
+        }
+        return new File([u8arr], filename);
+    }
+
+    async _sendClipboardData(e, _callback) {
+        // send the pasted file/text content
+        const peerId = e.detail.peerId;
+        let [files, text] = await _callback();
+
+        // Add possibility to paste base64 encoded file as text
+        if (window.pasteMode.textIsDataUri && text.indexOf(",") > -1) {
+            const mime = text.split(',')[0].match(/:(.*?);/)[1];
+            const filename = window.pasteMode.filename ?? "file." + window.pasteMode.mimeTypeSuffixMap[mime];
+            files = [this._dataURLtoFile(text, filename)];
+            text = "";
+        }
+
+        if (files.length > 0) {
             Events.fire('files-selected', {
                 files: files,
-                to: $$('x-peer').id
+                to: peerId
+            });
+        } else if (text.length > 0) {
+            Events.fire('send-text', {
+                text: text,
+                to: peerId
             });
         }
     }
@@ -73,9 +219,17 @@ class PeersUI {
 class PeerUI {
 
     html() {
+        let title = !window.pasteMode.activated
+            ? 'Click to send files or right click to send a message'
+            : 'Click to send clipboard content';
+
+        let text = !window.pasteMode.activated
+            ? '<input type="file" multiple>'
+            : '';
+
         return `
-            <label class="column center" title="Click to send files or right click to send a text">
-                <input type="file" multiple>
+            <label class="column center" title="${title}">
+                ${text}
                 <x-icon shadow="1">
                     <svg class="icon"><use xlink:href="#"/></svg>
                 </x-icon>
@@ -86,7 +240,7 @@ class PeerUI {
                 <div class="name font-subheading"></div>
                 <div class="device-name font-body2"></div>
                 <div class="status font-body2"></div>
-            </label>`
+            </label>`;
     }
 
     constructor(peer) {
@@ -98,6 +252,8 @@ class PeerUI {
     _initDom() {
         const el = document.createElement('x-peer');
         el.id = this._peer.id;
+        el.name = this._peer.name;
+        el.rtcSupported = this._peer.rtcSupported;
         el.innerHTML = this.html();
         el.ui = this;
         el.querySelector('svg use').setAttribute('xlink:href', this._icon());
@@ -108,17 +264,32 @@ class PeerUI {
     }
 
     _bindListeners(el) {
-        el.querySelector('input').addEventListener('change', e => this._onFilesSelected(e));
-        el.addEventListener('drop', e => this._onDrop(e));
-        el.addEventListener('dragend', e => this._onDragEnd(e));
-        el.addEventListener('dragleave', e => this._onDragEnd(e));
-        el.addEventListener('dragover', e => this._onDragOver(e));
-        el.addEventListener('contextmenu', e => this._onRightClick(e));
-        el.addEventListener('touchstart', e => this._onTouchStart(e));
-        el.addEventListener('touchend', e => this._onTouchEnd(e));
-        // prevent browser's default file drop behavior
-        Events.on('dragover', e => e.preventDefault());
-        Events.on('drop', e => e.preventDefault());
+        if(!window.pasteMode.activated) {
+            el.querySelector('input').addEventListener('change', e => this._onFilesSelected(e));
+            el.addEventListener('drop', e => this._onDrop(e));
+            el.addEventListener('dragend', e => this._onDragEnd(e));
+            el.addEventListener('dragleave', e => this._onDragEnd(e));
+            el.addEventListener('dragover', e => this._onDragOver(e));
+            el.addEventListener('contextmenu', e => this._onRightClick(e));
+            el.addEventListener('touchstart', e => this._onTouchStart(e));
+            el.addEventListener('touchend', e => this._onTouchEnd(e));
+            // prevent browser's default file drop behavior
+            Events.on('dragover', e => e.preventDefault());
+            Events.on('drop', e => e.preventDefault());
+        } else {
+            // somehow pointerdown event does not work with Async Clipboard API on Safari.
+            el.addEventListener('touchend', (e) => this._onPastePointerDown(e));
+            el.addEventListener('click', (e) => this._onPastePointerDown(e));
+        }
+    }
+
+    _onPastePointerDown(e) {
+        // Prevents triggering of event twice on touch devices
+        e.stopPropagation();
+        e.preventDefault();
+        Events.fire('paste-pointerdown', {
+            peerId: this._peer.id
+        });
     }
 
     _displayName() {
@@ -382,10 +553,10 @@ class ReceiveTextDialog extends Dialog {
 class Toast extends Dialog {
     constructor() {
         super('toast');
-        Events.on('notify-user', e => this._onNotfiy(e.detail));
+        Events.on('notify-user', e => this._onNotifiy(e.detail));
     }
 
-    _onNotfiy(message) {
+    _onNotifiy(message) {
         this.$el.textContent = message;
         this.show();
         setTimeout(_ => this.hide(), 3000);
@@ -500,10 +671,10 @@ class NetworkStatusUI {
 
 class WebShareTargetUI {
     constructor() {
-        const parsedUrl = new URL(window.location);
-        const title = parsedUrl.searchParams.get('title');
-        const text = parsedUrl.searchParams.get('text');
-        const url = parsedUrl.searchParams.get('url');
+        const urlParams = new URLSearchParams(window.location.search);
+        const title = urlParams.get('title');
+        const text = urlParams.get('text');
+        const url = urlParams.get('url');
 
         let shareTargetText = title ? title : '';
         shareTargetText += text ? shareTargetText ? ' ' + text : text : '';
@@ -517,6 +688,49 @@ class WebShareTargetUI {
     }
 }
 
+class PasteUI {
+    constructor() {
+        // restrict paste area editing
+        const xPasteArea = document.querySelectorAll('x-paste-area')[0];
+        xPasteArea.addEventListener('keydown', function(e) {
+            if (!(e.ctrlKey && e.code === 'KeyV')) {
+                e.preventDefault();
+                return false;
+            }
+        });
+        xPasteArea.addEventListener('selectstart', function(e) {
+            e.preventDefault();
+            return false;
+        });
+
+        //prepare base64 decoding of text in clipboard
+        const urlParams = new URLSearchParams(window.location.search);
+        if(urlParams.get('text_is_data_uri') === 'true') {
+            window.pasteMode.textIsDataUri = true
+            let req = new XMLHttpRequest();
+            req.open('GET', 'mime.types');
+            req.onload = function () {
+                window.pasteMode.mimeTypeSuffixMap = {}
+                const lines = this.responseText.split(/\r?\n/);
+                for (let line of lines) {
+                    if (!line.startsWith('#')) {
+                        let [suffix, mime] = line.split(/\s+/)
+                        window.pasteMode.mimeTypeSuffixMap[mime] = suffix;
+                    }
+                }
+            }
+            req.send();
+            if(urlParams.has('filename')) {
+                window.pasteMode.filename = urlParams.get('filename')
+            }
+        }
+        // activate paste mode if 'paste' is true
+        if(urlParams.get('paste') === 'true') {
+            Events.fire('activate-paste-mode')
+        }
+    }
+}
+
 
 class Snapdrop {
     constructor() {
@@ -531,6 +745,7 @@ class Snapdrop {
             const notifications = new Notifications();
             const networkStatusUI = new NetworkStatusUI();
             const webShareTargetUI = new WebShareTargetUI();
+            const pasteUI = new PasteUI();
         });
     }
 }
diff --git a/client/service-worker.js b/client/service-worker.js
index 9dae0801..dd7808c6 100644
--- a/client/service-worker.js
+++ b/client/service-worker.js
@@ -1,4 +1,4 @@
-var CACHE_NAME = 'snapdrop-cache-v2';
+var CACHE_NAME = 'snapdrop-cache-v3';
 var urlsToCache = [
   'index.html',
   './',
@@ -28,10 +28,7 @@ self.addEventListener('fetch', function(event) {
     caches.match(event.request)
       .then(function(response) {
         // Cache hit - return response
-        if (response) {
-          return response;
-        }
-        return fetch(event.request);
+          return response || fetch(event.request);
       }
     )
   );
diff --git a/client/styles.css b/client/styles.css
index 0a9aca98..b8b33e41 100644
--- a/client/styles.css
+++ b/client/styles.css
@@ -175,6 +175,32 @@ body>header a {
     margin-left: 8px;
 }
 
+/* Paste Area */
+x-paste-area {
+    position: absolute;
+    top: 150px;
+    width: 100%;
+    height: 30%;
+    text-align: center;
+    vertical-align: middle;
+    z-index: 0;
+    outline: 0 solid transparent;
+    opacity: 0.5;
+    /*easier to paste with caret*/
+    /*caret-color: transparent;*/
+    display: flex;
+    justify-content: center;
+}
+
+x-peers:empty~x-paste-area {
+    opacity: 0;
+}
+
+x-paste-area>.button {
+    align-self: baseline;
+    display: flex;
+}
+
 /* Peers List */
 
 x-peers {